From 2670086905b0721af123670c240e8fbc159c446d Mon Sep 17 00:00:00 2001
From: "Rajeev V. Pillai" <rajeevvp@gmail.com>
Date: Wed, 6 May 2009 12:23:45 +0100
Subject: cal: Highlight today even when month or year specified
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* misc-utils/cal.c: Unconditionally call time()
and highlight today where possible.

Signed-off-by: Rajeev V. Pillai <rajeevvp@gmail.com>
Signed-off-by: Pádraig Brady <P@draigBrady.com>
---
 misc-utils/cal.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 2417f1b5..f2d52e8c 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -348,6 +348,9 @@ main(int argc, char **argv) {
 	argc -= optind;
 	argv += optind;
 
+	time(&now);
+	local_time = localtime(&now);
+
 	day = month = year = 0;
 	switch(argc) {
 	case 3:
@@ -366,13 +369,13 @@ main(int argc, char **argv) {
 			if (day > dm)
 				errx(1, _("illegal day value: use 1-%d"), dm);
 			day = day_in_year(day, month, year);
+		} else if ((local_time->tm_year + 1900) == year) {
+			day = local_time->tm_yday + 1;
 		}
 		if (!month)
 			yflag=1;
 		break;
 	case 0:
-		time(&now);
-		local_time = localtime(&now);
 		day = local_time->tm_yday + 1;
 		year = local_time->tm_year + 1900;
 		month = local_time->tm_mon + 1;
-- 
cgit v1.2.3


From 1253662647f4b8a68062b420f2dad5c11a8a3c85 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 22 Apr 2009 09:18:28 +0200
Subject: chrt: don't assume SCHED_BATCH and SCHED_IDLE exist

SCHED_FIFO, SCHED_OTHER, SCHED_RR are part of POSIX 1003.1b Process
Scheduling, so it is correct to assume they always exists.

SCHED_BATCH and SCHED_IDLE are Linux specific, we should not assume
they exists.

Defining SCHED_BATCH and SCHED_IDLE to random values (ie the ones found
on Linux systems) is not an option as they may *collide* with the one of
other systems. For example on GNU/kFreeBSD we have:

   #define SCHED_RR        3

and on Linux we have:

   #define SCHED_BATCH     3

[kzak@redhat.com: - add "Linux specific" notes to chrt.1
                  - add a note about BATCH and PR conflict to
                    this commit message]

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 schedutils/chrt.1 |  2 ++
 schedutils/chrt.c | 29 +++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/schedutils/chrt.1 b/schedutils/chrt.1
index 83b3dbb0..06c58b47 100644
--- a/schedutils/chrt.1
+++ b/schedutils/chrt.1
@@ -63,6 +63,7 @@ operate on an existing PID and do not launch a new task
 .B -b, --batch
 set scheduling policy to
 .BR SCHED_BATCH
+(Linux specific)
 .TP
 .B -f, --fifo
 set scheduling policy to
@@ -71,6 +72,7 @@ set scheduling policy to
 .B -i, --idle
 set schedulng policy to
 .BR SCHED_IDLE
+(Linux specific)
 .TP
 .B -m, --max
 show minimum and maximum valid priorities, then exit
diff --git a/schedutils/chrt.c b/schedutils/chrt.c
index dcd05240..7d6bb2db 100644
--- a/schedutils/chrt.c
+++ b/schedutils/chrt.c
@@ -34,7 +34,7 @@
 /* the SCHED_BATCH is supported since Linux 2.6.16
  *  -- temporary workaround for people with old glibc headers
  */
-#ifndef SCHED_BATCH
+#if defined (__linux__) && !defined(SCHED_BATCH)
 # define SCHED_BATCH 3
 #endif
 
@@ -42,7 +42,7 @@
  * commit id 0e6aca43e08a62a48d6770e9a159dbec167bf4c6
  * -- temporary workaround for people with old glibc headers
  */
-#ifndef SCHED_IDLE
+#if defined (__linux__) && !defined(SCHED_IDLE)
 # define SCHED_IDLE 5
 #endif
 
@@ -95,15 +95,19 @@ static void show_rt_info(const char *what, pid_t pid)
 	case SCHED_FIFO:
 		printf("SCHED_FIFO\n");
 		break;
+#ifdef SCHED_IDLE
 	case SCHED_IDLE:
 		printf("SCHED_IDLE\n");
 		break;
+#endif
 	case SCHED_RR:
 		printf("SCHED_RR\n");
 		break;
+#ifdef SCHED_BATCH
 	case SCHED_BATCH:
 		printf("SCHED_BATCH\n");
 		break;
+#endif
 	default:
 		printf(_("unknown\n"));
 	}
@@ -119,8 +123,21 @@ static void show_min_max(void)
 {
 	int i;
 	int policies[] = { SCHED_OTHER, SCHED_FIFO, SCHED_RR,
-			   SCHED_BATCH, SCHED_IDLE };
-	const char *names[] = { "OTHER", "FIFO", "RR", "BATCH", "IDLE" };
+#ifdef SCHED_BATCH
+			   SCHED_BATCH,
+#endif
+#ifdef SCHED_IDLE
+			   SCHED_IDLE,
+#endif
+			 };
+	const char *names[] = { "OTHER", "FIFO", "RR",
+#ifdef SCHED_BATCH
+				"BATCH",
+#endif
+#ifdef SCHED_IDLE
+				"IDLE",
+#endif
+			      };
 
 	for (i = 0; i < ARRAY_SIZE(policies); i++) {
 		int max = sched_get_priority_max(policies[i]);
@@ -164,13 +181,17 @@ int main(int argc, char *argv[])
 
 		switch (i) {
 		case 'b':
+#ifdef SCHED_BATCH
 			policy = SCHED_BATCH;
+#endif
 			break;
 		case 'f':
 			policy = SCHED_FIFO;
 			break;
 		case 'i':
+#ifdef SCHED_IDLE
 			policy = SCHED_IDLE;
+#endif
 			break;
 		case 'm':
 			show_min_max();
-- 
cgit v1.2.3


From 28f0c63388ab7eeeb0953355dc4ff2edc5afe9e8 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 10 May 2009 16:37:18 -0400
Subject: lscpu: fix cpuid code on x86/PIC

If we build lscpu as PIE, we currently get a build failure:
lscpu.c: In function 'main':
lscpu.c:333: error: can't find a register in class 'BREG' while reloading 'asm'
lscpu.c:333: error: 'asm' operand has impossible constraints
make[2]: *** [lscpu.o] Error 1

So we need a little bit of register shuffling to keep gcc happy.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 sys-utils/lscpu.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 3e3fbbeb..6b6082fb 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -330,9 +330,19 @@ static inline void
 cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx,
 			 unsigned int *ecx, unsigned int *edx)
 {
-	__asm__("cpuid"
-		: "=a" (*eax),
-		  "=b" (*ebx),
+	__asm__(
+#if defined(__PIC__) && defined(__i386__)
+		/* x86 PIC cannot clobber ebx -- gcc bitches */
+		"pushl %%ebx;"
+		"cpuid;"
+		"movl %%ebx, %%esi;"
+		"popl %%ebx;"
+		: "=S" (*ebx),
+#else
+		"cpuid;"
+		: "=b" (*ebx),
+#endif
+		  "=a" (*eax),
 		  "=c" (*ecx),
 		  "=d" (*edx)
 		: "0" (op), "c"(0));
-- 
cgit v1.2.3


From 83277bc95a84f325d5f3dab3babf2998dc8b4555 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 10 May 2009 16:57:31 -0400
Subject: losetup: handle symlinks in /dev/loop/

The loop_scandir() expects all the files in /dev/loop/ to be actual
devices and not symlinks to devices.  However, udev by default sets up
symlinks in /dev/loop/ thereby breaking the fallback scan logic when
looking for devices more than the default number of 8.

Simple way to reproduce is:
 - <detach all devices>
 - cd /dev/loop
 - rm -f [2-7]
 - losetup 0 autogen.sh
 - mv 1 8
 - for n in {1..7} ; do ln -s 0 $n ; done
 - losetup -f
	<error but should have found /dev/loop/8>

[kay.sievers@vrfy.org:
       just a note, udev does not do that by default. It is
       devfs-nonsense, which the "default" never did.]

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reported-by: Mario Bachmann <grafgrimm77@gmx.de>
---
 mount/lomount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mount/lomount.c b/mount/lomount.c
index d62198ef..c173409e 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -256,7 +256,7 @@ loop_scandir(const char *dirname, int **ary, int hasprefix)
 	*ary = NULL;
 
 	while((d = readdir(dir))) {
-		if (d->d_type != DT_BLK && d->d_type != DT_UNKNOWN)
+		if (d->d_type != DT_BLK && d->d_type != DT_UNKNOWN && d->d_type != DT_LNK)
 			continue;
 		n = name2minor(hasprefix, d->d_name);
 		if (n == -1 || n < NLOOPS_DEFAULT)
-- 
cgit v1.2.3


From 8731ff7813d7a2eacde63630f8d78e2a447bb60d Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Mon, 11 May 2009 11:49:00 +0200
Subject: build-sys: fix "make -C" bug

Running:

./configure --with-fsprobe=builtin
make -C mount mount

causes the following error:

gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I..  -include ../config.h
-I../include -DLOCALEDIR=\"/home/matthew/util-linux-ng/share/locale\"
-fsigned-char -I../libs/blkid/src   -g -O2 -MT mount-setproctitle.o
-MD -MP -MF .deps/mount-setproctitle.Tpo -c -o mount-setproctitle.o
`test -f '../lib/setproctitle.c' || echo './'`../lib/setproctitle.c mv
-f .deps/mount-setproctitle.Tpo .deps/mount-setproctitle.Po
make -C
make: option requires an argument -- 'C'
Usage: make [options] [target] ...
...

Reported-by: Matthew Burgess <matthew@linuxfromscratch.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 config/include-Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index b42a0c3a..d5da619a 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -17,6 +17,7 @@ dist_noinst_DATA = $(dist_man_MANS)
 # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
 #
 ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
+ul_libblkid_builddir = $(top_builddir)/libs/blkid/src
 ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
 
 $(ul_libblkid_la):
-- 
cgit v1.2.3


From 89598ba56618b5972827473c6f6a74dab7a612f4 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Mon, 11 May 2009 15:06:06 +0200
Subject: build-sys: fix blkid.h include for old e2fsprogs

   When building util-linux-ng-2.15, I get this:
   ../lib/fsprobe.c:10:19: error: blkid.h: No such file or directory

Unfortunately, the blkid.pc uses -I${includedir}/blkidi since
e2fsprogs v1.41.2. The old versions use -I${includedir} only.

Reported-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 configure.ac  | 14 +++++++++++++-
 lib/fsprobe.c |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 46dc3235..ec41ae60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,19 @@ have_volume_id=no
 
 if test "x$with_fsprobe" = xblkid; then
   PKG_CHECK_MODULES(BLKID, blkid, [have_blkid=yes], [])
-  AC_CHECK_LIB(blkid, blkid_evaluate_tag, [have_blkid_evaluate=yes], [])
+  if test "x$have_blkid" = xyes; then
+    old_CFLAGS="$CFLAGS"
+    old_CPPFLAGS="$CPPFLAGS"
+    old_LDFLAGS="$LDFLAGS"
+    CFLAGS="$CFLAGS $BLKID_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $BLKID_CFLAGS"
+    LDFLAGS="$LDFLAGS $BLKID_LIBS"
+    AC_CHECK_HEADERS([blkid.h blkid/blkid.h], [break], [])
+    AC_CHECK_FUNC(blkid_evaluate_tag, [have_blkid_evaluate=yes], [])
+    CFLAGS="$old_CFLAGS"
+    CPPFLAGS="$old_CPPFLAGS"
+    LDFLAGS="$old_LDFLAGS"
+  fi
 elif test "x$with_fsprobe" = xvolume_id; then
   PKG_CHECK_MODULES(VOLUME_ID, volume_id, [have_volume_id=yes], [])
 elif test "x$with_fsprobe" = xbuiltin; then
diff --git a/lib/fsprobe.c b/lib/fsprobe.c
index cd008cc3..c5fa8c63 100644
--- a/lib/fsprobe.c
+++ b/lib/fsprobe.c
@@ -7,7 +7,11 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
+#ifdef HAVE_BLKID_BLKID_H
+#include <blkid/blkid.h>
+#else
 #include <blkid.h>
+#endif
 
 #include "blkdev.h"
 #include "canonicalize.h"
-- 
cgit v1.2.3


From cfbfb044d2a5c3abf159077ecc12adf8d3a76197 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 12 May 2009 21:22:19 +0200
Subject: blkid: make libuuid optional

read.c:28:23: error: uuid/uuid.h: No such file or directory
make[3]: *** [read.lo] Error 1
make[3]: *** Waiting for unfinished jobs....

Reported-by: Olaf <mailinglists@ban-solms.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libs/blkid/src/config.c   | 3 ---
 libs/blkid/src/evaluate.c | 3 ---
 libs/blkid/src/read.c     | 1 -
 3 files changed, 7 deletions(-)

diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c
index 2e592181..9091736b 100644
--- a/libs/blkid/src/config.c
+++ b/libs/blkid/src/config.c
@@ -24,9 +24,6 @@
 #include <errno.h>
 #endif
 #include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
 #include <stdarg.h>
 
 #include "blkdev.h"
diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c
index a9c9fbab..f0ae1266 100644
--- a/libs/blkid/src/evaluate.c
+++ b/libs/blkid/src/evaluate.c
@@ -27,9 +27,6 @@
 #include <errno.h>
 #endif
 #include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
 #include <stdarg.h>
 
 #include "pathnames.h"
diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c
index 41638745..b5e9cd02 100644
--- a/libs/blkid/src/read.c
+++ b/libs/blkid/src/read.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "blkidP.h"
-#include "uuid/uuid.h"
 
 #ifdef HAVE_STRTOULL
 #define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */
-- 
cgit v1.2.3


From 45488c4bd600300d2a639e81d443bcc9c41c10bc Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 14 May 2009 18:04:55 +0200
Subject: blkid: fix "hangs forever with partition type mdraid"

> #:> blkid /dev/sda7
> /dev/sda7: UUID="c193d159-1fd4-1a4b-4037-f3433e016f3d" TYPE="mdraid"
>
> The blkid binary build from the util-linux-ng sources just hangs
> forever with 100% cpu load with the same command.

Reported-by: Juergen Daubert <jue@jue.li>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libs/blkid/src/probe.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/libs/blkid/src/probe.c b/libs/blkid/src/probe.c
index 0e4745ac..b0c0be80 100644
--- a/libs/blkid/src/probe.c
+++ b/libs/blkid/src/probe.c
@@ -160,6 +160,11 @@ static void blkid_probe_reset_vals(blkid_probe pr)
 	pr->nvals = 0;
 }
 
+static void blkid_probe_reset_idx(blkid_probe pr)
+{
+	pr->idx = -1;
+}
+
 void blkid_reset_probe(blkid_probe pr)
 {
 	if (!pr)
@@ -169,14 +174,13 @@ void blkid_reset_probe(blkid_probe pr)
 		memset(pr->buf, 0, pr->buf_max);
 	pr->buf_off = 0;
 	pr->buf_len = 0;
-	pr->idx = 0;
 	if (pr->sbbuf)
 		memset(pr->sbbuf, 0, BLKID_SB_BUFSIZ);
 	pr->sbbuf_len = 0;
 	blkid_probe_reset_vals(pr);
+	blkid_probe_reset_idx(pr);
 }
 
-
 /*
  * Note that we have two offsets:
  *
@@ -263,7 +267,6 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
 	pr->fd = fd;
 	pr->off = off;
 	pr->size = 0;
-	pr->idx = 0;
 
 	if (size)
 		pr->size = size;
@@ -307,7 +310,7 @@ int blkid_probe_reset_filter(blkid_probe pr)
 		return -1;
 	if (pr->fltr)
 		memset(pr->fltr, 0, BLKID_FLTR_SIZE * sizeof(unsigned long));
-	pr->idx = 0;
+	blkid_probe_reset_idx(pr);
 	return 0;
 }
 
@@ -324,9 +327,10 @@ int blkid_probe_filter_types(blkid_probe pr, int flag, char *names[])
 
 	if (!pr || !names)
 		return -1;
-	if (!pr->fltr)
+	if (!pr->fltr) {
 		pr->fltr = calloc(BLKID_FLTR_SIZE, sizeof(unsigned long));
-	else
+		blkid_probe_reset_idx(pr);
+	} else
 		blkid_probe_reset_filter(pr);
 
 	if (!pr->fltr)
@@ -355,7 +359,6 @@ int blkid_probe_filter_types(blkid_probe pr, int flag, char *names[])
 		}
 	}
 	DBG(DEBUG_LOWPROBE, printf("a new probing type-filter initialized\n"));
-	pr->idx = 0;
 	return 0;
 }
 
@@ -375,9 +378,10 @@ int blkid_probe_filter_usage(blkid_probe pr, int flag, int usage)
 
 	if (!pr || !usage)
 		return -1;
-	if (!pr->fltr)
+	if (!pr->fltr) {
 		pr->fltr = calloc(BLKID_FLTR_SIZE, sizeof(unsigned long));
-	else
+		blkid_probe_reset_idx(pr);
+	} else
 		blkid_probe_reset_filter(pr);
 
 	if (!pr->fltr)
@@ -393,7 +397,6 @@ int blkid_probe_filter_usage(blkid_probe pr, int flag, int usage)
 			blkid_bmp_set_item(pr->fltr, i);
 	}
 	DBG(DEBUG_LOWPROBE, printf("a new probing usage-filter initialized\n"));
-	pr->idx = 0;
 	return 0;
 }
 
@@ -407,8 +410,8 @@ int blkid_probe_invert_filter(blkid_probe pr)
 	for (i = 0; i < BLKID_FLTR_SIZE; i++)
 		pr->fltr[i] = ~pr->fltr[i];
 
+	blkid_probe_reset_idx(pr);
 	DBG(DEBUG_LOWPROBE, printf("probing filter inverted\n"));
-	pr->idx = 0;
 	return 0;
 }
 
@@ -455,8 +458,7 @@ int blkid_do_probe(blkid_probe pr)
 
 	blkid_probe_reset_vals(pr);
 
-	if (pr->idx)
-		i = pr->idx + 1;
+	i = pr->idx + 1;
 
 	if (i < 0 && i >= ARRAY_SIZE(idinfos))
 		return -1;
-- 
cgit v1.2.3


From 40b1f830b91540befd50ff995e8769e0b09d0372 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 14 May 2009 18:29:03 +0200
Subject: blkid: blkid_do_safeprobe() has to be tolerant to RAIDs

It's pretty generic that RAID signature is on the same device as FS
signature. We have to be tolerant and ignore filesystems signatures
on such devices. The RAID signature is always preferred.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libs/blkid/src/probe.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libs/blkid/src/probe.c b/libs/blkid/src/probe.c
index b0c0be80..af22e34d 100644
--- a/libs/blkid/src/probe.c
+++ b/libs/blkid/src/probe.c
@@ -529,6 +529,10 @@ int blkid_do_probe(blkid_probe pr)
  * This is the same function as blkid_do_probe(), but returns only one result
  * (cannot be used in while()) and checks for ambivalen results (more
  * filesystems on the device) -- in such case returns -2.
+ *
+ * The function does not check for filesystems when a RAID signature is
+ * detected.  The function also does not check for collision between RAIDs. The
+ * first detected RAID is returned.
  */
 int blkid_do_safeprobe(blkid_probe pr)
 {
@@ -544,9 +548,12 @@ int blkid_do_safeprobe(blkid_probe pr)
 			first.nvals = pr->nvals;
 			first.idx = pr->idx;
 		}
+		count++;
+
+		if (idinfos[pr->idx]->usage & BLKID_USAGE_RAID)
+			break;
 		if (!(idinfos[pr->idx]->flags & BLKID_IDINFO_TOLERANT))
 			intol++;
-		count++;
 	}
 	if (rc < 0)
 		return rc;		/* error */
-- 
cgit v1.2.3


From f7f1de581a7933e4a791793e267036c35ae52da3 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 14 May 2009 20:28:11 +0200
Subject: blkid: cleanup debug messages and return codes in blkid_do_probe()

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libs/blkid/src/probe.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/libs/blkid/src/probe.c b/libs/blkid/src/probe.c
index af22e34d..38d42762 100644
--- a/libs/blkid/src/probe.c
+++ b/libs/blkid/src/probe.c
@@ -453,17 +453,16 @@ int blkid_do_probe(blkid_probe pr)
 {
 	int i = 0;
 
-	if (!pr)
+	if (!pr || pr->idx < -1)
 		return -1;
 
 	blkid_probe_reset_vals(pr);
 
-	i = pr->idx + 1;
+	DBG(DEBUG_LOWPROBE,
+		printf("--> starting probing loop [idx=%d]\n",
+		pr->idx));
 
-	if (i < 0 && i >= ARRAY_SIZE(idinfos))
-		return -1;
-
-	DBG(DEBUG_LOWPROBE, printf("--> starting probing loop\n"));
+	i = pr->idx + 1;
 
 	for ( ; i < ARRAY_SIZE(idinfos); i++) {
 		const struct blkid_idinfo *id;
@@ -518,10 +517,13 @@ int blkid_do_probe(blkid_probe pr)
 			blkid_probe_set_usage(pr, id->usage);
 
 		DBG(DEBUG_LOWPROBE,
-			printf("<-- leaving probing loop (type=%s)\n", id->name));
+			printf("<-- leaving probing loop (type=%s) [idx=%d]\n",
+			id->name, pr->idx));
 		return 0;
 	}
-	DBG(DEBUG_LOWPROBE, printf("<-- leaving probing loop (failed)\n"));
+	DBG(DEBUG_LOWPROBE,
+		printf("<-- leaving probing loop (failed) [idx=%d]\n",
+		pr->idx));
 	return 1;
 }
 
-- 
cgit v1.2.3


From 281a1782f0d7d9b7e6495e6265d25188e925b3a3 Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@ualberta.net>
Date: Thu, 14 May 2009 22:43:02 -0400
Subject: cal: uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.

Signed-off-by: Tom Prince <cougar@hermes>
---
 configure.ac     | 2 ++
 misc-utils/cal.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ec41ae60..9ab94a85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,8 @@ AC_CHECK_HEADERS([linux/raw.h],
 		 [AM_CONDITIONAL([HAVE_RAW], [true])],
 		 [AM_CONDITIONAL([HAVE_RAW], [false])])
 
+AC_CHECK_DECLS([_NL_TIME_WEEK_1STDAY],[],[],[[#include <langinfo.h>]])
+
 AC_CHECK_FUNCS(
 	[inet_aton \
 	fsync \
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index f2d52e8c..a8534b8c 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -291,7 +291,7 @@ main(int argc, char **argv) {
  * the locale database, which can be overridden with the
  * -s (Sunday) or -m (Monday) options.
  */
-#ifdef HAVE_LANGINFO_H
+#if HAVE_DECL__NL_TIME_WEEK_1STDAY
 	/*
 	 * You need to use 2 locale variables to get the first day of the week.
 	 * This is needed to support first_weekday=2 and first_workday=1 for
-- 
cgit v1.2.3


From 34a48f403a237f86de927988761481903d4ed41d Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Wed, 13 May 2009 15:54:23 +0100
Subject: fdisk: (and cfdisk) fix to be consistent about maximum heads

Fix fdisk and cfdisk to be consistent about maximum heads

Without this patch, fdisk allows up to 256 heads to be set via the menu, but
only up to 255 heads by command line -H. Similarly, cfdisk's -H option also
enforces heads <= 255 instead of heads <= 256.

The strange limit of 256 comes about because (heads - 1) should fit in a
single byte for legacy CHS. Geometries of 256 heads and 32 sectors are seen
in disks from other operating systems where cylinder-aligned partitions
which are also aligned to a 4MB boundary are wanted.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 fdisk/cfdisk.c | 2 +-
 fdisk/fdisk.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 96246803..fc0357d2 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -107,7 +107,7 @@
 
 #define SECTOR_SIZE 512
 
-#define MAX_HEADS 255
+#define MAX_HEADS 256
 #define MAX_SECTORS 63
 
 #define ACTIVE_FLAG 0x80
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index ef75d4ce..aaa01a84 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -2623,7 +2623,7 @@ main(int argc, char **argv) {
 			break;
 		case 'H':
 			user_heads = atoi(optarg);
-			if (user_heads <= 0 || user_heads >= 256)
+			if (user_heads <= 0 || user_heads > 256)
 				user_heads = 0;
 			break;
 		case 'S':
-- 
cgit v1.2.3


From ad5f84d8272578c81f1d54953277b1633858da38 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 21 May 2009 13:20:10 +0200
Subject: mount: fix undefined reference to `security_get_initial_context'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> Gentoo-hardened stable have: sys-libs/libselinux-1.34.14
> I have:
> mount.c:(.text+0x12ce): undefined reference to `security_get_initial_context'

Reported-by: Максим Бритов <maxim.britov@gmail.com>
Addresses-Gentoo-Bug: #270168
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 configure.ac  | 5 +++++
 mount/mount.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9ab94a85..69d63e01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -656,6 +656,11 @@ fi
 if test "x$have_selinux" = xyes; then
   SELINUX_LIBS="-lselinux -lsepol"
   SELINUX_LIBS_STATIC="-lselinux -lsepol"
+  old_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $SELINUX_LIBS"
+  # This function is missing in old libselinux 1.xx versions
+  AC_CHECK_FUNCS([security_get_initial_context])
+  LDFLAGS="$old_LDFLAGS"
 fi
 AC_SUBST([SELINUX_LIBS])
 AC_SUBST([SELINUX_LIBS_STATIC])
diff --git a/mount/mount.c b/mount/mount.c
index f48f9d40..cc5b88ae 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -1561,7 +1561,7 @@ mount_retry:
 
  out:
 
-#ifdef HAVE_LIBSELINUX
+#if defined(HAVE_LIBSELINUX) && defined(HAVE_SECURITY_GET_INITIAL_CONTEXT)
   if (res != EX_FAIL && verbose && is_selinux_enabled() > 0) {
       security_context_t raw = NULL, def = NULL;
 
-- 
cgit v1.2.3


From b802c3f6b23c8192eaad391d64e93431dd507625 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Sat, 16 May 2009 02:25:37 +0200
Subject: libblkid: update man page

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libs/blkid/libblkid.3 | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/libs/blkid/libblkid.3 b/libs/blkid/libblkid.3
index 89747ecf..46eb868b 100644
--- a/libs/blkid/libblkid.3
+++ b/libs/blkid/libblkid.3
@@ -5,7 +5,7 @@
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
 .\" Created  Wed Sep 14 12:02:12 2001, Andreas Dilger
-.TH LIBBLKID 3 "February 2009" "Linux" "MAINTENANCE COMMANDS""
+.TH LIBBLKID 3 "May 2009" "util-linux-ng"
 .SH NAME
 libblkid \- block device identification library
 .SH SYNOPSIS
@@ -45,14 +45,43 @@ some way to locate these devices without enumerating only visible devices,
 so the use of the cache file is
 .B required
 in this situation.
+.SH CONFIGURATION FILE
+The standard location of the
+.I /etc/blkid.conf
+config file can be overridden by the environment variable BLKID_CONF.
+The following options control the libblkid library:
+.TP
+.I SEND_UEVENT=<yes|not>
+Sends uevent when
+.I /dev/disk/by-{label,uuid}/
+symlink does not match with LABEL or UUID on the device. Default is "yes".
+.TP
+.I CACHE_FILE=<path>
+Overrides the standard location of the cache file. This setting can be
+overridden by the environment variable BLKID_FILE. Default is
+.I /etc/blkid.tab.
+.TP
+.I EVALUATE=<methods>
+Defines LABEL and UUID evaluation method(s). Currently, the libblkid library
+supports "udev" and "scan" methods. More than one methods may be specified in
+a comma separated list. Default is "udev,scan". The "udev" method uses udev
+.I /dev/disk/by-*
+symlinks and the "scan" method scans all block devices from the
+.I /proc/partitions
+file.
 .SH AUTHOR
 .B libblkid
 was written by Andreas Dilger for the ext2 filesystem utilties, with input
 from Ted Ts'o.  The library was subsequently heavily modified by Ted Ts'o.
+
+The low-level probing code was rewritten by Karel Zak.
 .SH FILES
-.TP
+.TP 18
 .I /etc/blkid.tab
-Caches data extracted from each recognized block device.
+caches data extracted from each recognized block device
+.TP
+.I /etc/blkid.conf
+configuration file
 .SH AVAILABILITY
 .B libblkid
 is part of the util-linux-ng package since version 2.15 and is available from
-- 
cgit v1.2.3


From 5b3f8e4f961298a9ca296f8362a717c1a4dd2ee0 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Mon, 25 May 2009 10:36:08 +0200
Subject: libblkid: fix reiserfs name

Reported-by: Jonas Karlsson <cj.karlsson@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libs/blkid/src/probers/reiserfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/blkid/src/probers/reiserfs.c b/libs/blkid/src/probers/reiserfs.c
index 29e1faa0..f9a46787 100644
--- a/libs/blkid/src/probers/reiserfs.c
+++ b/libs/blkid/src/probers/reiserfs.c
@@ -95,7 +95,7 @@ static int probe_reiser4(blkid_probe pr, const struct blkid_idmag *mag)
 
 const struct blkid_idinfo reiser_idinfo =
 {
-	.name		= "reiser",
+	.name		= "reiserfs",
 	.usage		= BLKID_USAGE_FILESYSTEM,
 	.probefunc	= probe_reiser,
 	.magics		=
-- 
cgit v1.2.3


From 1e22efe13ddf4ea890dbfc9b3573706ebe04400d Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Mon, 18 May 2009 09:35:32 +0200
Subject: build-sys: add UTIL_{SET,RESTORE}_FLAGS

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 configure.ac | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 69d63e01..14744923 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,24 @@ AC_DEFUN([UTIL_CHECK_LIB], [
   AM_CONDITIONAL(AS_TR_CPP([HAVE_]suffix), [test [$have_]suffix = yes])
 ])
 
+dnl UTIL_SET_FLAGS(CFLAGS, CPPFLAGS, LDFLAGS)
+AC_DEFUN([UTIL_SET_FLAGS], [
+  old_CFLAGS="$CFLAGS"
+  old_CPPFLAGS="$CPPFLAGS"
+  old_LDFLAGS="$LDFLAGS"
+  CFLAGS="$CFLAGS $1"
+  CPPFLAGS="$CPPFLAGS $2"
+  LDFLAGS="$LDFLAGS $3"
+])
+
+dnl UTIL_RESTORE_FLAGS()
+AC_DEFUN([UTIL_RESTORE_FLAGS], [
+  CFLAGS="$old_CFLAGS"
+  CPPFLAGS="$old_CPPFLAGS"
+  LDFLAGS="$old_LDFLAGS"
+])
+
+
 UTIL_CHECK_LIB(uuid, uuid_is_null)
 if test "x$have_uuid" = xno; then
   AC_MSG_WARN([uuid library is not found; mkswap(8) will not generate UUIDs])
@@ -183,17 +201,10 @@ have_volume_id=no
 if test "x$with_fsprobe" = xblkid; then
   PKG_CHECK_MODULES(BLKID, blkid, [have_blkid=yes], [])
   if test "x$have_blkid" = xyes; then
-    old_CFLAGS="$CFLAGS"
-    old_CPPFLAGS="$CPPFLAGS"
-    old_LDFLAGS="$LDFLAGS"
-    CFLAGS="$CFLAGS $BLKID_CFLAGS"
-    CPPFLAGS="$CPPFLAGS $BLKID_CFLAGS"
-    LDFLAGS="$LDFLAGS $BLKID_LIBS"
+    UTIL_SET_FLAGS($BLKID_CFLAGS, $BLKID_CFLAGS, $BLKID_LIBS)
     AC_CHECK_HEADERS([blkid.h blkid/blkid.h], [break], [])
     AC_CHECK_FUNC(blkid_evaluate_tag, [have_blkid_evaluate=yes], [])
-    CFLAGS="$old_CFLAGS"
-    CPPFLAGS="$old_CPPFLAGS"
-    LDFLAGS="$old_LDFLAGS"
+    UTIL_RESTORE_FLAGS
   fi
 elif test "x$with_fsprobe" = xvolume_id; then
   PKG_CHECK_MODULES(VOLUME_ID, volume_id, [have_volume_id=yes], [])
-- 
cgit v1.2.3


From 30a634f075037fc6211e7837cbe7bb778bf7efce Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 14:14:12 +0200
Subject: build-sys: fix blkid detection in configure.ac

Changes:

 - volume_id/blkid is not required when --disable-mount + --disable-fsck

 - volume_id/blkid detection works on systems without pkg-config

(This patch is simplified version of the patch
f910b5594f4293046902a6ed1d05e7f6ce0ee6b9 from master (2.16) branch.)

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 configure.ac | 95 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 50 insertions(+), 45 deletions(-)

diff --git a/configure.ac b/configure.ac
index 14744923..ecf96c82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,28 @@ AC_DEFUN([UTIL_RESTORE_FLAGS], [
   LDFLAGS="$old_LDFLAGS"
 ])
 
+AC_ARG_ENABLE([mount],
+  AS_HELP_STRING([--disable-mount], [do not build mount utilities]),
+  [], enable_mount=check
+)
+build_mount=yes
+if test "x$enable_mount" = xcheck; then
+  if test "x$linux_os" = xno; then
+    AC_MSG_WARN([non-linux system; do not build mount utilities])
+    build_mount=no
+  fi
+elif test "x$enable_mount" = xno; then
+    build_mount=no
+fi
+AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
+
+
+AC_ARG_ENABLE([fsck],
+  AS_HELP_STRING([--enable-fsck], [do build fsck]),
+  [], enable_fsck=no
+)
+AM_CONDITIONAL(BUILD_FSCK, test "x$enable_fsck" = xyes)
+
 
 UTIL_CHECK_LIB(uuid, uuid_is_null)
 if test "x$have_uuid" = xno; then
@@ -194,33 +216,46 @@ AC_ARG_WITH([fsprobe],
 )
 
 build_libblkid=no
-have_blkid_evaluate=no
 have_blkid=no
 have_volume_id=no
 
-if test "x$with_fsprobe" = xblkid; then
-  PKG_CHECK_MODULES(BLKID, blkid, [have_blkid=yes], [])
-  if test "x$have_blkid" = xyes; then
-    UTIL_SET_FLAGS($BLKID_CFLAGS, $BLKID_CFLAGS, $BLKID_LIBS)
-    AC_CHECK_HEADERS([blkid.h blkid/blkid.h], [break], [])
-    AC_CHECK_FUNC(blkid_evaluate_tag, [have_blkid_evaluate=yes], [])
-    UTIL_RESTORE_FLAGS
-  fi
-elif test "x$with_fsprobe" = xvolume_id; then
-  PKG_CHECK_MODULES(VOLUME_ID, volume_id, [have_volume_id=yes], [])
-elif test "x$with_fsprobe" = xbuiltin; then
+if test "x$with_fsprobe" = xbuiltin; then
   have_blkid=yes
   build_libblkid=yes
-  have_blkid_evaluate=yes
   AC_SUBST(LIBBLKID_VERSION)
   AC_DEFINE_UNQUOTED(LIBBLKID_VERSION, "$LIBBLKID_VERSION", [libblkid version string])
   AC_DEFINE_UNQUOTED(LIBBLKID_DATE, "$LIBBLKID_DATE", [libblkid date string])
+  AC_DEFINE(HAVE_BLKID_EVALUATE_TAG, 1, [Define to 1 if you have the blkid_evaluate_tag().])
+  AC_DEFINE(HAVE_BLKID_H, 1, [Define to 1 if you have the <blkid.h> header file.])
+elif test "x$build_mount" = xyes || test "x$enable_fsck" = xyes; then
+  if test "x$with_fsprobe" = xblkid; then
+    PKG_CHECK_MODULES(BLKID, blkid, [have_blkid=yes], [have_blkid=no])
+    if test "x$have_blkid" = xno; then
+      # system without pkg-config or so, try classic check
+      AC_CHECK_LIB(blkid, blkid_get_cache, [have_blkid=yes], [have_blkid=no])
+    fi
+    if test "x$have_blkid" = xyes; then
+      UTIL_SET_FLAGS($BLKID_CFLAGS, $BLKID_CFLAGS, $BLKID_LIBS)
+      AC_CHECK_HEADERS([blkid.h blkid/blkid.h], [break], [])
+      UTIL_RESTORE_FLAGS
+    fi
+  elif test "x$with_fsprobe" = xvolume_id; then
+    PKG_CHECK_MODULES(VOLUME_ID, volume_id, [have_volume_id=yes], [have_volume_id=no])
+    if test "x$have_volume_id" = xno; then
+      # system without pkg-config or so, try classic check
+      AC_CHECK_LIB(volume_id, volume_id_probe_all, [have_volume_id=yes], [have_volume_id=no])
+    fi
+  fi
 fi
 
 if  test "x$have_blkid" = xyes; then
   AC_DEFINE(HAVE_LIBBLKID, 1, [Define to 1 if you have the -lblkid.])
-  if test "x$have_blkid_evaluate" = xyes; then
-    AC_DEFINE(HAVE_BLKID_EVALUATE_TAG, 1, [Define to 1 if you have the blkid_evaluate_tag().])
+elif test "x$have_volume_id" = xno; then
+  if test "x$build_mount" = xyes; then
+    AC_MSG_ERROR([libblkid or libvolume_id is needed to build util-linux-ng mount])
+  fi
+  if test "x$enable_fsck" = xyes; then
+    AC_MSG_ERROR([libblkid or libvoume_id is needed to build util-linux-ng fsck])
   fi
 fi
 
@@ -229,36 +264,6 @@ AM_CONDITIONAL(HAVE_VOLUME_ID, test "x$have_volume_id" = xyes)
 AM_CONDITIONAL(BUILD_LIBBLKID, test "x$build_libblkid" = xyes)
 
 
-AC_ARG_ENABLE([mount],
-  AS_HELP_STRING([--disable-mount], [do not build mount utilities]),
-  [], enable_mount=check
-)
-build_mount=yes
-if test "${enable_mount}" = "no"; then
-  build_mount=no
-elif test "x$linux_os" = xyes; then
-  if test "x$have_blkid" = xno && test "x$have_volume_id" = xno; then
-    AC_MSG_ERROR([blkid or volume_id is needed to build util-linux-ng mount utilities])
-  fi
-else
-  AC_MSG_WARN([non-linux system; do not build mount utilities])
-  build_mount=no
-fi
-AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
-
-
-AC_ARG_ENABLE([fsck],
-  AS_HELP_STRING([--enable-fsck], [do build fsck]),
-  [], enable_fsck=no
-)
-if test "x$enable_fsck" = xyes; then
-  if test "x$have_blkid" = xno && test "x$have_volume_id" = xno; then
-    AC_MSG_ERROR([libblkid or libvolume_id is needed to build util-linux-ng fsck])
-  fi
-fi
-AM_CONDITIONAL(BUILD_FSCK, test "x$enable_fsck" = xyes)
-
-
 dnl UTIL_PKG_STATIC(VARIABLE, MODULES)
 dnl ----------------------------------
 AC_DEFUN([UTIL_PKG_STATIC], [
-- 
cgit v1.2.3


From 090e9f17072816be117258a307e62a2bb3e0975d Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 15:03:22 +0200
Subject: tests: add mdraid libblkid test

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/expected/blkid/low-probe-mdraid |   5 +++++
 tests/ts/blkid/images/mdraid.img.bz2  | Bin 0 -> 160 bytes
 2 files changed, 5 insertions(+)
 create mode 100644 tests/expected/blkid/low-probe-mdraid
 create mode 100644 tests/ts/blkid/images/mdraid.img.bz2

diff --git a/tests/expected/blkid/low-probe-mdraid b/tests/expected/blkid/low-probe-mdraid
new file mode 100644
index 00000000..0613dfe0
--- /dev/null
+++ b/tests/expected/blkid/low-probe-mdraid
@@ -0,0 +1,5 @@
+ID_FS_TYPE=linux_raid_member
+ID_FS_USAGE=raid
+ID_FS_UUID=37c76b91-011a-05c5-d30c-1fd4c5c3dbbc
+ID_FS_UUID_ENC=37c76b91-011a-05c5-d30c-1fd4c5c3dbbc
+ID_FS_VERSION=0.90.0
diff --git a/tests/ts/blkid/images/mdraid.img.bz2 b/tests/ts/blkid/images/mdraid.img.bz2
new file mode 100644
index 00000000..d5a67a34
Binary files /dev/null and b/tests/ts/blkid/images/mdraid.img.bz2 differ
-- 
cgit v1.2.3


From 9728b6803657d38f1afa0dd0bd0066812c5739c3 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 15:05:02 +0200
Subject: tests: fix reiserfs test

For more details see 5b3f8e4f961298a9ca296f8362a717c1a4dd2ee0.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/expected/blkid/low-probe-reiser3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/expected/blkid/low-probe-reiser3 b/tests/expected/blkid/low-probe-reiser3
index e046c418..7d9e0147 100644
--- a/tests/expected/blkid/low-probe-reiser3
+++ b/tests/expected/blkid/low-probe-reiser3
@@ -1,6 +1,6 @@
 ID_FS_LABEL_ENC=TESTREISER
 ID_FS_LABEL=TESTREISER
-ID_FS_TYPE=reiser
+ID_FS_TYPE=reiserfs
 ID_FS_USAGE=filesystem
 ID_FS_UUID=9efe7863-b124-46dc-ad68-8ecd04230a7b
 ID_FS_UUID_ENC=9efe7863-b124-46dc-ad68-8ecd04230a7b
-- 
cgit v1.2.3


From b78a8da7a4d77b7649da647b30efeff9f8275031 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 15:20:01 +0200
Subject: tests: don't run some mount tests for non-root users

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/functions.sh          | 6 +++---
 tests/ts/mount/noncanonical | 1 +
 tests/ts/mount/paths        | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/functions.sh b/tests/functions.sh
index b2e17f3c..d07b7e31 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -153,7 +153,7 @@ function ts_init_subtest {
 	[ $TS_NSUBTESTS -eq 0 ] && echo
 	TS_NSUBTESTS=$(( $TS_NSUBTESTS + 1 ))
 
-	printf "%18s: %-27s ..." "" "$TS_SUBNAME"
+	printf "%16s: %-27s ..." "" "$TS_SUBNAME"
 }
 
 function ts_init {
@@ -161,7 +161,7 @@ function ts_init {
 
 	ts_init_env "$*"
 
-	printf "%15s: %-30s ..." "$TS_COMPONENT" "$TS_DESC"
+	printf "%13s: %-30s ..." "$TS_COMPONENT" "$TS_DESC"
 
 	[ "$is_fake" == "yes" ] && ts_skip "fake mode"
 }
@@ -218,7 +218,7 @@ function ts_finalize {
 	done
 
 	if [ $TS_NSUBTESTS -ne 0 ]; then
-		printf "%13s..."
+		printf "%11s..."
 		if [ $TS_NSUBFAILED -ne 0 ]; then
 			ts_failed "$TS_NSUBFAILED from $TS_NSUBTESTS sub-tests"
 		else
diff --git a/tests/ts/mount/noncanonical b/tests/ts/mount/noncanonical
index d9be68be..31149923 100755
--- a/tests/ts/mount/noncanonical
+++ b/tests/ts/mount/noncanonical
@@ -20,6 +20,7 @@ TS_DESC="non canonical path"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+ts_skip_nonroot
 
 [ ! -e "/etc" ] && ts_skip "/etc not such file of directory"
 
diff --git a/tests/ts/mount/paths b/tests/ts/mount/paths
index 93b44ae9..bb2cabf3 100755
--- a/tests/ts/mount/paths
+++ b/tests/ts/mount/paths
@@ -20,6 +20,7 @@ TS_DESC="basic paths"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+ts_skip_nonroot
 
 $TS_CMD_MOUNT -n -f -v -v -v /dev/dummy /mnt &> $TS_OUTPUT
 
-- 
cgit v1.2.3


From ee8a029a8ca46ea8c690eef723c92319e846dbbe Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 15:47:49 +0200
Subject: tests: remove broken Xen dumps for lscpu

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 .../lscpu/dumps/i386-xenpara/proc/bus/pci/devices  |  0
 tests/ts/lscpu/dumps/i386-xenpara/proc/cpuinfo     | 38 ----------------------
 .../lscpu/dumps/i386-xenpara/proc/xen/capabilities |  0
 .../sys/devices/system/cpu/cpu0/cache/index0/level |  1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |  1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/level |  1 -
 .../system/cpu/cpu0/cache/index2/shared_cpu_map    |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/size  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/type  |  1 -
 .../dumps/x86_64-xenfull/proc/bus/pci/devices      |  8 -----
 tests/ts/lscpu/dumps/x86_64-xenfull/proc/cpuinfo   | 38 ----------------------
 .../sys/devices/system/cpu/cpu0/cache/index0/level |  1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |  1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/level |  1 -
 .../system/cpu/cpu0/cache/index2/shared_cpu_map    |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/size  |  1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/type  |  1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |  1 -
 .../system/cpu/cpu0/topology/thread_siblings       |  1 -
 .../sys/devices/system/node/node0/cpumap           |  1 -
 32 files changed, 111 deletions(-)
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/proc/bus/pci/devices
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/proc/xen/capabilities
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/proc/bus/pci/devices
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/node/node0/cpumap

diff --git a/tests/ts/lscpu/dumps/i386-xenpara/proc/bus/pci/devices b/tests/ts/lscpu/dumps/i386-xenpara/proc/bus/pci/devices
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/proc/cpuinfo b/tests/ts/lscpu/dumps/i386-xenpara/proc/cpuinfo
deleted file mode 100644
index 14a24da8..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/proc/cpuinfo
+++ /dev/null
@@ -1,38 +0,0 @@
-processor	: 0
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 23
-model name	: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-stepping	: 6
-cpu MHz		: 2493.776
-cache size	: 6144 KB
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu tsc msr pae mce cx8 apic mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc pni monitor ds_cpl vmx est tm2 cx16 xtpr lahf_lm
-bogomips	: 6236.83
-
-processor	: 1
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 23
-model name	: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-stepping	: 6
-cpu MHz		: 2493.776
-cache size	: 6144 KB
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu tsc msr pae mce cx8 apic mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc up pni monitor ds_cpl vmx est tm2 cx16 xtpr lahf_lm
-bogomips	: 6236.83
-
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/proc/xen/capabilities b/tests/ts/lscpu/dumps/i386-xenpara/proc/xen/capabilities
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/level b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
deleted file mode 100644
index b9ad9ed2..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/size b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/type b/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-xenpara/sys/devices/system/cpu/cpu0/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/proc/bus/pci/devices b/tests/ts/lscpu/dumps/x86_64-xenfull/proc/bus/pci/devices
deleted file mode 100644
index e977cd23..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/proc/bus/pci/devices
+++ /dev/null
@@ -1,8 +0,0 @@
-0000	80861237	0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0
-0008	80867000	0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0
-0009	80867010	0	               0	               0	               0	               0	            c001	               0	               0	               0	               0	               0	               0	              10	               0	               0	PIIX_IDE
-000a	80867113	9	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0
-000b	80867020	b1	               0	               0	               0	               0	            c021	               0	               0	               0	               0	               0	               0	              20	               0	               0	uhci_hcd
-0010	101300b8	0	        f0000008	        f2000000	               0	               0	               0	               0	               2	         2000000	            1000	               0	               0	               0	               0	               0
-0018	58530001	a9	            c101	        f3000008	               0	               0	               0	               0	               0	             100	         1000000	               0	               0	               0	               0	               0	xen-platform-pci
-0020	10ec8139	b9	            c201	        f4000000	               0	               0	               0	               0	               0	             100	             100	               0	               0	               0	               0	               0	8139cp
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/proc/cpuinfo b/tests/ts/lscpu/dumps/x86_64-xenfull/proc/cpuinfo
deleted file mode 100644
index ebd29f48..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/proc/cpuinfo
+++ /dev/null
@@ -1,38 +0,0 @@
-processor	: 0
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 23
-model name	: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-stepping	: 6
-cpu MHz		: 2493.900
-cache size	: 6144 KB
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts mmx fxsr sse sse2 ss syscall nx lm constant_tsc pni ds_cpl cx16 xtpr lahf_lm
-bogomips	: 5002.01
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 38 bits physical, 48 bits virtual
-power management:
-
-processor	: 1
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 23
-model name	: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-stepping	: 6
-cpu MHz		: 2493.900
-cache size	: 6144 KB
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts mmx fxsr sse sse2 ss syscall nx lm constant_tsc pni ds_cpl cx16 xtpr lahf_lm
-bogomips	: 4989.49
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 38 bits physical, 48 bits virtual
-power management:
-
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/node/node0/cpumap b/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/node/node0/cpumap
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-xenfull/sys/devices/system/node/node0/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
-- 
cgit v1.2.3


From a4342354ffa5b9ff6067790fda39ad95ba411117 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 16:06:04 +0200
Subject: tests: move lscpu /proc and /sys dumps to tarballs

It's easy to maintain few tarballs that tons of files.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/ts/lscpu/dumps/i386-amdshanghai.tar.gz       | Bin 0 -> 3395 bytes
 tests/ts/lscpu/dumps/i386-amdshanghai/proc/cpuinfo | 184 ----------
 .../sys/devices/system/cpu/cpu0/cache/index0/level |   1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |   1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/level |   1 -
 .../system/cpu/cpu0/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/level |   1 -
 .../system/cpu/cpu0/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |   1 -
 .../system/cpu/cpu0/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/level |   1 -
 .../system/cpu/cpu1/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/level |   1 -
 .../system/cpu/cpu1/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/level |   1 -
 .../system/cpu/cpu1/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/level |   1 -
 .../system/cpu/cpu1/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu1/topology/core_siblings |   1 -
 .../system/cpu/cpu1/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/level |   1 -
 .../system/cpu/cpu2/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/level |   1 -
 .../system/cpu/cpu2/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/level |   1 -
 .../system/cpu/cpu2/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/level |   1 -
 .../system/cpu/cpu2/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu2/topology/core_siblings |   1 -
 .../system/cpu/cpu2/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/level |   1 -
 .../system/cpu/cpu3/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/level |   1 -
 .../system/cpu/cpu3/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/level |   1 -
 .../system/cpu/cpu3/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/level |   1 -
 .../system/cpu/cpu3/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu3/topology/core_siblings |   1 -
 .../system/cpu/cpu3/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/level |   1 -
 .../system/cpu/cpu4/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/level |   1 -
 .../system/cpu/cpu4/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/level |   1 -
 .../system/cpu/cpu4/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/level |   1 -
 .../system/cpu/cpu4/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu4/topology/core_siblings |   1 -
 .../system/cpu/cpu4/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/level |   1 -
 .../system/cpu/cpu5/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/level |   1 -
 .../system/cpu/cpu5/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/level |   1 -
 .../system/cpu/cpu5/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/level |   1 -
 .../system/cpu/cpu5/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu5/topology/core_siblings |   1 -
 .../system/cpu/cpu5/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/level |   1 -
 .../system/cpu/cpu6/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/level |   1 -
 .../system/cpu/cpu6/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/level |   1 -
 .../system/cpu/cpu6/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/level |   1 -
 .../system/cpu/cpu6/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu6/topology/core_siblings |   1 -
 .../system/cpu/cpu6/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/level |   1 -
 .../system/cpu/cpu7/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/level |   1 -
 .../system/cpu/cpu7/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/level |   1 -
 .../system/cpu/cpu7/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/level |   1 -
 .../system/cpu/cpu7/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu7/topology/core_siblings |   1 -
 .../system/cpu/cpu7/topology/thread_siblings       |   1 -
 tests/ts/lscpu/dumps/i386-dellpe700.tar.gz         | Bin 0 -> 799 bytes
 tests/ts/lscpu/dumps/i386-dellpe700/proc/cpuinfo   |  46 ---
 .../devices/system/cpu/cpu0/thermal_throttle/count |   1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |   1 -
 .../system/cpu/cpu0/topology/thread_siblings       |   1 -
 .../devices/system/cpu/cpu1/thermal_throttle/count |   1 -
 .../devices/system/cpu/cpu1/topology/core_siblings |   1 -
 .../system/cpu/cpu1/topology/thread_siblings       |   1 -
 tests/ts/lscpu/dumps/i386-intels5000phb.tar.gz     | Bin 0 -> 2865 bytes
 .../ts/lscpu/dumps/i386-intels5000phb/proc/cpuinfo | 184 ----------
 .../sys/devices/system/cpu/cpu0/cache/index0/level |   1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |   1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/level |   1 -
 .../system/cpu/cpu0/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |   1 -
 .../system/cpu/cpu0/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/level |   1 -
 .../system/cpu/cpu1/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/level |   1 -
 .../system/cpu/cpu1/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/level |   1 -
 .../system/cpu/cpu1/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu1/topology/core_siblings |   1 -
 .../system/cpu/cpu1/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/level |   1 -
 .../system/cpu/cpu2/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/level |   1 -
 .../system/cpu/cpu2/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/level |   1 -
 .../system/cpu/cpu2/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu2/topology/core_siblings |   1 -
 .../system/cpu/cpu2/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/level |   1 -
 .../system/cpu/cpu3/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/level |   1 -
 .../system/cpu/cpu3/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/level |   1 -
 .../system/cpu/cpu3/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu3/topology/core_siblings |   1 -
 .../system/cpu/cpu3/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/level |   1 -
 .../system/cpu/cpu4/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/level |   1 -
 .../system/cpu/cpu4/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/level |   1 -
 .../system/cpu/cpu4/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu4/topology/core_siblings |   1 -
 .../system/cpu/cpu4/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/level |   1 -
 .../system/cpu/cpu5/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/level |   1 -
 .../system/cpu/cpu5/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/level |   1 -
 .../system/cpu/cpu5/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu5/topology/core_siblings |   1 -
 .../system/cpu/cpu5/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/level |   1 -
 .../system/cpu/cpu6/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/level |   1 -
 .../system/cpu/cpu6/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/level |   1 -
 .../system/cpu/cpu6/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu6/topology/core_siblings |   1 -
 .../system/cpu/cpu6/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/level |   1 -
 .../system/cpu/cpu7/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/level |   1 -
 .../system/cpu/cpu7/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/level |   1 -
 .../system/cpu/cpu7/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu7/topology/core_siblings |   1 -
 .../system/cpu/cpu7/topology/thread_siblings       |   1 -
 tests/ts/lscpu/dumps/ia64-hpmatterhorn.tar.gz      | Bin 0 -> 3514 bytes
 .../ts/lscpu/dumps/ia64-hpmatterhorn/proc/cpuinfo  | 120 -------
 .../sys/devices/system/cpu/cpu0/cache/index0/level |   1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |   1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/level |   1 -
 .../system/cpu/cpu0/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/level |   1 -
 .../system/cpu/cpu0/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |   1 -
 .../system/cpu/cpu0/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/level |   1 -
 .../system/cpu/cpu1/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/level |   1 -
 .../system/cpu/cpu1/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/level |   1 -
 .../system/cpu/cpu1/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/level |   1 -
 .../system/cpu/cpu1/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu1/topology/core_siblings |   1 -
 .../system/cpu/cpu1/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/level |   1 -
 .../system/cpu/cpu2/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/level |   1 -
 .../system/cpu/cpu2/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/level |   1 -
 .../system/cpu/cpu2/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/level |   1 -
 .../system/cpu/cpu2/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu2/topology/core_siblings |   1 -
 .../system/cpu/cpu2/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/level |   1 -
 .../system/cpu/cpu3/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/level |   1 -
 .../system/cpu/cpu3/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/level |   1 -
 .../system/cpu/cpu3/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/level |   1 -
 .../system/cpu/cpu3/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu3/topology/core_siblings |   1 -
 .../system/cpu/cpu3/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/level |   1 -
 .../system/cpu/cpu4/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/level |   1 -
 .../system/cpu/cpu4/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/level |   1 -
 .../system/cpu/cpu4/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/level |   1 -
 .../system/cpu/cpu4/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu4/topology/core_siblings |   1 -
 .../system/cpu/cpu4/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/level |   1 -
 .../system/cpu/cpu5/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/level |   1 -
 .../system/cpu/cpu5/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/level |   1 -
 .../system/cpu/cpu5/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/level |   1 -
 .../system/cpu/cpu5/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu5/topology/core_siblings |   1 -
 .../system/cpu/cpu5/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/level |   1 -
 .../system/cpu/cpu6/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/level |   1 -
 .../system/cpu/cpu6/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/level |   1 -
 .../system/cpu/cpu6/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/level |   1 -
 .../system/cpu/cpu6/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu6/topology/core_siblings |   1 -
 .../system/cpu/cpu6/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/level |   1 -
 .../system/cpu/cpu7/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/level |   1 -
 .../system/cpu/cpu7/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/level |   1 -
 .../system/cpu/cpu7/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/level |   1 -
 .../system/cpu/cpu7/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu7/topology/core_siblings |   1 -
 .../system/cpu/cpu7/topology/thread_siblings       |   1 -
 .../sys/devices/system/node/node0/cpu4             |   1 -
 .../sys/devices/system/node/node0/cpu5             |   1 -
 .../sys/devices/system/node/node0/cpu6             |   1 -
 .../sys/devices/system/node/node0/cpu7             |   1 -
 .../sys/devices/system/node/node0/cpumap           |   1 -
 .../sys/devices/system/node/node1/cpu0             |   1 -
 .../sys/devices/system/node/node1/cpu1             |   1 -
 .../sys/devices/system/node/node1/cpu2             |   1 -
 .../sys/devices/system/node/node1/cpu3             |   1 -
 .../sys/devices/system/node/node1/cpumap           |   1 -
 .../sys/devices/system/node/node2/cpumap           |   1 -
 tests/ts/lscpu/dumps/ia64-hprx1620.tar.gz          | Bin 0 -> 1384 bytes
 tests/ts/lscpu/dumps/ia64-hprx1620/proc/cpuinfo    |  30 --
 .../sys/devices/system/cpu/cpu0/cache/index0/level |   1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |   1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/level |   1 -
 .../system/cpu/cpu0/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/level |   1 -
 .../system/cpu/cpu0/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |   1 -
 .../system/cpu/cpu0/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/level |   1 -
 .../system/cpu/cpu1/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/level |   1 -
 .../system/cpu/cpu1/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/level |   1 -
 .../system/cpu/cpu1/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/level |   1 -
 .../system/cpu/cpu1/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu1/topology/core_siblings |   1 -
 .../system/cpu/cpu1/topology/thread_siblings       |   1 -
 .../sys/devices/system/node/node0/cpu0             |   1 -
 .../sys/devices/system/node/node0/cpu1             |   1 -
 .../sys/devices/system/node/node0/cpumap           |   1 -
 tests/ts/lscpu/dumps/ia64-pg0.tar.gz               | Bin 0 -> 7784 bytes
 tests/ts/lscpu/dumps/ia64-pg0/proc/cpuinfo         | 288 ----------------
 .../sys/devices/system/cpu/cpu0/cache/index0/level |   1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |   1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/level |   1 -
 .../system/cpu/cpu0/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/level |   1 -
 .../system/cpu/cpu0/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index4/level |   1 -
 .../system/cpu/cpu0/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |   1 -
 .../system/cpu/cpu0/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/level |   1 -
 .../system/cpu/cpu1/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/level |   1 -
 .../system/cpu/cpu1/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/level |   1 -
 .../system/cpu/cpu1/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/level |   1 -
 .../system/cpu/cpu1/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index4/level |   1 -
 .../system/cpu/cpu1/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu1/topology/core_siblings |   1 -
 .../system/cpu/cpu1/topology/thread_siblings       |   1 -
 .../devices/system/cpu/cpu10/cache/index0/level    |   1 -
 .../system/cpu/cpu10/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index0/type |   1 -
 .../devices/system/cpu/cpu10/cache/index1/level    |   1 -
 .../system/cpu/cpu10/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index1/type |   1 -
 .../devices/system/cpu/cpu10/cache/index2/level    |   1 -
 .../system/cpu/cpu10/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index2/type |   1 -
 .../devices/system/cpu/cpu10/cache/index3/level    |   1 -
 .../system/cpu/cpu10/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index3/type |   1 -
 .../devices/system/cpu/cpu10/cache/index4/level    |   1 -
 .../system/cpu/cpu10/cache/index4/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index4/size |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index4/type |   1 -
 .../system/cpu/cpu10/topology/core_siblings        |   1 -
 .../system/cpu/cpu10/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu11/cache/index0/level    |   1 -
 .../system/cpu/cpu11/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index0/type |   1 -
 .../devices/system/cpu/cpu11/cache/index1/level    |   1 -
 .../system/cpu/cpu11/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index1/type |   1 -
 .../devices/system/cpu/cpu11/cache/index2/level    |   1 -
 .../system/cpu/cpu11/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index2/type |   1 -
 .../devices/system/cpu/cpu11/cache/index3/level    |   1 -
 .../system/cpu/cpu11/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index3/type |   1 -
 .../devices/system/cpu/cpu11/cache/index4/level    |   1 -
 .../system/cpu/cpu11/cache/index4/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index4/size |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index4/type |   1 -
 .../system/cpu/cpu11/topology/core_siblings        |   1 -
 .../system/cpu/cpu11/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu12/cache/index0/level    |   1 -
 .../system/cpu/cpu12/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index0/type |   1 -
 .../devices/system/cpu/cpu12/cache/index1/level    |   1 -
 .../system/cpu/cpu12/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index1/type |   1 -
 .../devices/system/cpu/cpu12/cache/index2/level    |   1 -
 .../system/cpu/cpu12/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index2/type |   1 -
 .../devices/system/cpu/cpu12/cache/index3/level    |   1 -
 .../system/cpu/cpu12/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index3/type |   1 -
 .../devices/system/cpu/cpu12/cache/index4/level    |   1 -
 .../system/cpu/cpu12/cache/index4/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index4/size |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index4/type |   1 -
 .../system/cpu/cpu12/topology/core_siblings        |   1 -
 .../system/cpu/cpu12/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu13/cache/index0/level    |   1 -
 .../system/cpu/cpu13/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index0/type |   1 -
 .../devices/system/cpu/cpu13/cache/index1/level    |   1 -
 .../system/cpu/cpu13/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index1/type |   1 -
 .../devices/system/cpu/cpu13/cache/index2/level    |   1 -
 .../system/cpu/cpu13/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index2/type |   1 -
 .../devices/system/cpu/cpu13/cache/index3/level    |   1 -
 .../system/cpu/cpu13/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index3/type |   1 -
 .../devices/system/cpu/cpu13/cache/index4/level    |   1 -
 .../system/cpu/cpu13/cache/index4/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index4/size |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index4/type |   1 -
 .../system/cpu/cpu13/topology/core_siblings        |   1 -
 .../system/cpu/cpu13/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu14/cache/index0/level    |   1 -
 .../system/cpu/cpu14/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index0/type |   1 -
 .../devices/system/cpu/cpu14/cache/index1/level    |   1 -
 .../system/cpu/cpu14/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index1/type |   1 -
 .../devices/system/cpu/cpu14/cache/index2/level    |   1 -
 .../system/cpu/cpu14/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index2/type |   1 -
 .../devices/system/cpu/cpu14/cache/index3/level    |   1 -
 .../system/cpu/cpu14/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index3/type |   1 -
 .../devices/system/cpu/cpu14/cache/index4/level    |   1 -
 .../system/cpu/cpu14/cache/index4/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index4/size |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index4/type |   1 -
 .../system/cpu/cpu14/topology/core_siblings        |   1 -
 .../system/cpu/cpu14/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu15/cache/index0/level    |   1 -
 .../system/cpu/cpu15/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index0/type |   1 -
 .../devices/system/cpu/cpu15/cache/index1/level    |   1 -
 .../system/cpu/cpu15/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index1/type |   1 -
 .../devices/system/cpu/cpu15/cache/index2/level    |   1 -
 .../system/cpu/cpu15/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index2/type |   1 -
 .../devices/system/cpu/cpu15/cache/index3/level    |   1 -
 .../system/cpu/cpu15/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index3/type |   1 -
 .../devices/system/cpu/cpu15/cache/index4/level    |   1 -
 .../system/cpu/cpu15/cache/index4/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index4/size |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index4/type |   1 -
 .../system/cpu/cpu15/topology/core_siblings        |   1 -
 .../system/cpu/cpu15/topology/thread_siblings      |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/level |   1 -
 .../system/cpu/cpu2/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/level |   1 -
 .../system/cpu/cpu2/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/level |   1 -
 .../system/cpu/cpu2/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/level |   1 -
 .../system/cpu/cpu2/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index4/level |   1 -
 .../system/cpu/cpu2/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu2/topology/core_siblings |   1 -
 .../system/cpu/cpu2/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/level |   1 -
 .../system/cpu/cpu3/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/level |   1 -
 .../system/cpu/cpu3/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/level |   1 -
 .../system/cpu/cpu3/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/level |   1 -
 .../system/cpu/cpu3/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index4/level |   1 -
 .../system/cpu/cpu3/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu3/topology/core_siblings |   1 -
 .../system/cpu/cpu3/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/level |   1 -
 .../system/cpu/cpu4/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/level |   1 -
 .../system/cpu/cpu4/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/level |   1 -
 .../system/cpu/cpu4/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/level |   1 -
 .../system/cpu/cpu4/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index4/level |   1 -
 .../system/cpu/cpu4/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu4/topology/core_siblings |   1 -
 .../system/cpu/cpu4/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/level |   1 -
 .../system/cpu/cpu5/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/level |   1 -
 .../system/cpu/cpu5/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/level |   1 -
 .../system/cpu/cpu5/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/level |   1 -
 .../system/cpu/cpu5/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index4/level |   1 -
 .../system/cpu/cpu5/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu5/topology/core_siblings |   1 -
 .../system/cpu/cpu5/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/level |   1 -
 .../system/cpu/cpu6/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/level |   1 -
 .../system/cpu/cpu6/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/level |   1 -
 .../system/cpu/cpu6/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/level |   1 -
 .../system/cpu/cpu6/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index4/level |   1 -
 .../system/cpu/cpu6/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu6/topology/core_siblings |   1 -
 .../system/cpu/cpu6/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/level |   1 -
 .../system/cpu/cpu7/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/level |   1 -
 .../system/cpu/cpu7/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/level |   1 -
 .../system/cpu/cpu7/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/level |   1 -
 .../system/cpu/cpu7/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index4/level |   1 -
 .../system/cpu/cpu7/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu7/topology/core_siblings |   1 -
 .../system/cpu/cpu7/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index0/level |   1 -
 .../system/cpu/cpu8/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index1/level |   1 -
 .../system/cpu/cpu8/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index2/level |   1 -
 .../system/cpu/cpu8/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index3/level |   1 -
 .../system/cpu/cpu8/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index4/level |   1 -
 .../system/cpu/cpu8/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu8/topology/core_siblings |   1 -
 .../system/cpu/cpu8/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index0/level |   1 -
 .../system/cpu/cpu9/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index1/level |   1 -
 .../system/cpu/cpu9/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index2/level |   1 -
 .../system/cpu/cpu9/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index3/level |   1 -
 .../system/cpu/cpu9/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index3/type  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index4/level |   1 -
 .../system/cpu/cpu9/cache/index4/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index4/size  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index4/type  |   1 -
 .../devices/system/cpu/cpu9/topology/core_siblings |   1 -
 .../system/cpu/cpu9/topology/thread_siblings       |   1 -
 .../ia64-pg0/sys/devices/system/node/node0/cpu0    |   1 -
 .../ia64-pg0/sys/devices/system/node/node0/cpu1    |   1 -
 .../ia64-pg0/sys/devices/system/node/node0/cpu2    |   1 -
 .../ia64-pg0/sys/devices/system/node/node0/cpu3    |   1 -
 .../ia64-pg0/sys/devices/system/node/node0/cpu4    |   1 -
 .../ia64-pg0/sys/devices/system/node/node0/cpu5    |   1 -
 .../ia64-pg0/sys/devices/system/node/node0/cpu6    |   1 -
 .../ia64-pg0/sys/devices/system/node/node0/cpu7    |   1 -
 .../ia64-pg0/sys/devices/system/node/node0/cpumap  |   1 -
 .../ia64-pg0/sys/devices/system/node/node1/cpu10   |   1 -
 .../ia64-pg0/sys/devices/system/node/node1/cpu11   |   1 -
 .../ia64-pg0/sys/devices/system/node/node1/cpu12   |   1 -
 .../ia64-pg0/sys/devices/system/node/node1/cpu13   |   1 -
 .../ia64-pg0/sys/devices/system/node/node1/cpu14   |   1 -
 .../ia64-pg0/sys/devices/system/node/node1/cpu15   |   1 -
 .../ia64-pg0/sys/devices/system/node/node1/cpu8    |   1 -
 .../ia64-pg0/sys/devices/system/node/node1/cpu9    |   1 -
 .../ia64-pg0/sys/devices/system/node/node1/cpumap  |   1 -
 tests/ts/lscpu/dumps/x86_64-hpdl585.tar.gz         | Bin 0 -> 6910 bytes
 tests/ts/lscpu/dumps/x86_64-hpdl585/proc/cpuinfo   | 384 ---------------------
 .../sys/devices/system/cpu/cpu0/cache/index0/level |   1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |   1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/level |   1 -
 .../system/cpu/cpu0/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/level |   1 -
 .../system/cpu/cpu0/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |   1 -
 .../system/cpu/cpu0/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/level |   1 -
 .../system/cpu/cpu1/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/level |   1 -
 .../system/cpu/cpu1/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/level |   1 -
 .../system/cpu/cpu1/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/level |   1 -
 .../system/cpu/cpu1/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu1/topology/core_siblings |   1 -
 .../system/cpu/cpu1/topology/thread_siblings       |   1 -
 .../devices/system/cpu/cpu10/cache/index0/level    |   1 -
 .../system/cpu/cpu10/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index0/type |   1 -
 .../devices/system/cpu/cpu10/cache/index1/level    |   1 -
 .../system/cpu/cpu10/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index1/type |   1 -
 .../devices/system/cpu/cpu10/cache/index2/level    |   1 -
 .../system/cpu/cpu10/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index2/type |   1 -
 .../devices/system/cpu/cpu10/cache/index3/level    |   1 -
 .../system/cpu/cpu10/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu10/cache/index3/type |   1 -
 .../system/cpu/cpu10/topology/core_siblings        |   1 -
 .../system/cpu/cpu10/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu11/cache/index0/level    |   1 -
 .../system/cpu/cpu11/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index0/type |   1 -
 .../devices/system/cpu/cpu11/cache/index1/level    |   1 -
 .../system/cpu/cpu11/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index1/type |   1 -
 .../devices/system/cpu/cpu11/cache/index2/level    |   1 -
 .../system/cpu/cpu11/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index2/type |   1 -
 .../devices/system/cpu/cpu11/cache/index3/level    |   1 -
 .../system/cpu/cpu11/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu11/cache/index3/type |   1 -
 .../system/cpu/cpu11/topology/core_siblings        |   1 -
 .../system/cpu/cpu11/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu12/cache/index0/level    |   1 -
 .../system/cpu/cpu12/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index0/type |   1 -
 .../devices/system/cpu/cpu12/cache/index1/level    |   1 -
 .../system/cpu/cpu12/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index1/type |   1 -
 .../devices/system/cpu/cpu12/cache/index2/level    |   1 -
 .../system/cpu/cpu12/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index2/type |   1 -
 .../devices/system/cpu/cpu12/cache/index3/level    |   1 -
 .../system/cpu/cpu12/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu12/cache/index3/type |   1 -
 .../system/cpu/cpu12/topology/core_siblings        |   1 -
 .../system/cpu/cpu12/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu13/cache/index0/level    |   1 -
 .../system/cpu/cpu13/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index0/type |   1 -
 .../devices/system/cpu/cpu13/cache/index1/level    |   1 -
 .../system/cpu/cpu13/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index1/type |   1 -
 .../devices/system/cpu/cpu13/cache/index2/level    |   1 -
 .../system/cpu/cpu13/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index2/type |   1 -
 .../devices/system/cpu/cpu13/cache/index3/level    |   1 -
 .../system/cpu/cpu13/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu13/cache/index3/type |   1 -
 .../system/cpu/cpu13/topology/core_siblings        |   1 -
 .../system/cpu/cpu13/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu14/cache/index0/level    |   1 -
 .../system/cpu/cpu14/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index0/type |   1 -
 .../devices/system/cpu/cpu14/cache/index1/level    |   1 -
 .../system/cpu/cpu14/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index1/type |   1 -
 .../devices/system/cpu/cpu14/cache/index2/level    |   1 -
 .../system/cpu/cpu14/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index2/type |   1 -
 .../devices/system/cpu/cpu14/cache/index3/level    |   1 -
 .../system/cpu/cpu14/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu14/cache/index3/type |   1 -
 .../system/cpu/cpu14/topology/core_siblings        |   1 -
 .../system/cpu/cpu14/topology/thread_siblings      |   1 -
 .../devices/system/cpu/cpu15/cache/index0/level    |   1 -
 .../system/cpu/cpu15/cache/index0/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index0/size |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index0/type |   1 -
 .../devices/system/cpu/cpu15/cache/index1/level    |   1 -
 .../system/cpu/cpu15/cache/index1/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index1/size |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index1/type |   1 -
 .../devices/system/cpu/cpu15/cache/index2/level    |   1 -
 .../system/cpu/cpu15/cache/index2/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index2/size |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index2/type |   1 -
 .../devices/system/cpu/cpu15/cache/index3/level    |   1 -
 .../system/cpu/cpu15/cache/index3/shared_cpu_map   |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index3/size |   1 -
 .../sys/devices/system/cpu/cpu15/cache/index3/type |   1 -
 .../system/cpu/cpu15/topology/core_siblings        |   1 -
 .../system/cpu/cpu15/topology/thread_siblings      |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/level |   1 -
 .../system/cpu/cpu2/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/level |   1 -
 .../system/cpu/cpu2/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/level |   1 -
 .../system/cpu/cpu2/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/level |   1 -
 .../system/cpu/cpu2/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu2/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu2/topology/core_siblings |   1 -
 .../system/cpu/cpu2/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/level |   1 -
 .../system/cpu/cpu3/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/level |   1 -
 .../system/cpu/cpu3/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/level |   1 -
 .../system/cpu/cpu3/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/level |   1 -
 .../system/cpu/cpu3/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu3/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu3/topology/core_siblings |   1 -
 .../system/cpu/cpu3/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/level |   1 -
 .../system/cpu/cpu4/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/level |   1 -
 .../system/cpu/cpu4/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/level |   1 -
 .../system/cpu/cpu4/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/level |   1 -
 .../system/cpu/cpu4/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu4/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu4/topology/core_siblings |   1 -
 .../system/cpu/cpu4/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/level |   1 -
 .../system/cpu/cpu5/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/level |   1 -
 .../system/cpu/cpu5/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/level |   1 -
 .../system/cpu/cpu5/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/level |   1 -
 .../system/cpu/cpu5/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu5/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu5/topology/core_siblings |   1 -
 .../system/cpu/cpu5/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/level |   1 -
 .../system/cpu/cpu6/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/level |   1 -
 .../system/cpu/cpu6/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/level |   1 -
 .../system/cpu/cpu6/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/level |   1 -
 .../system/cpu/cpu6/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu6/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu6/topology/core_siblings |   1 -
 .../system/cpu/cpu6/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/level |   1 -
 .../system/cpu/cpu7/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/level |   1 -
 .../system/cpu/cpu7/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/level |   1 -
 .../system/cpu/cpu7/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/level |   1 -
 .../system/cpu/cpu7/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu7/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu7/topology/core_siblings |   1 -
 .../system/cpu/cpu7/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index0/level |   1 -
 .../system/cpu/cpu8/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index1/level |   1 -
 .../system/cpu/cpu8/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index2/level |   1 -
 .../system/cpu/cpu8/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index3/level |   1 -
 .../system/cpu/cpu8/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu8/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu8/topology/core_siblings |   1 -
 .../system/cpu/cpu8/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index0/level |   1 -
 .../system/cpu/cpu9/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index1/level |   1 -
 .../system/cpu/cpu9/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index2/level |   1 -
 .../system/cpu/cpu9/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index2/type  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index3/level |   1 -
 .../system/cpu/cpu9/cache/index3/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index3/size  |   1 -
 .../sys/devices/system/cpu/cpu9/cache/index3/type  |   1 -
 .../devices/system/cpu/cpu9/topology/core_siblings |   1 -
 .../system/cpu/cpu9/topology/thread_siblings       |   1 -
 .../sys/devices/system/node/node0/cpu0             |   1 -
 .../sys/devices/system/node/node0/cpu12            |   1 -
 .../sys/devices/system/node/node0/cpu4             |   1 -
 .../sys/devices/system/node/node0/cpu8             |   1 -
 .../sys/devices/system/node/node0/cpumap           |   1 -
 .../sys/devices/system/node/node1/cpu1             |   1 -
 .../sys/devices/system/node/node1/cpu13            |   1 -
 .../sys/devices/system/node/node1/cpu5             |   1 -
 .../sys/devices/system/node/node1/cpu9             |   1 -
 .../sys/devices/system/node/node1/cpumap           |   1 -
 .../sys/devices/system/node/node2/cpu10            |   1 -
 .../sys/devices/system/node/node2/cpu14            |   1 -
 .../sys/devices/system/node/node2/cpu2             |   1 -
 .../sys/devices/system/node/node2/cpu6             |   1 -
 .../sys/devices/system/node/node2/cpumap           |   1 -
 .../sys/devices/system/node/node3/cpu11            |   1 -
 .../sys/devices/system/node/node3/cpu15            |   1 -
 .../sys/devices/system/node/node3/cpu3             |   1 -
 .../sys/devices/system/node/node3/cpu7             |   1 -
 .../sys/devices/system/node/node3/cpumap           |   1 -
 tests/ts/lscpu/dumps/x86_64-ibme326m.tar.gz        | Bin 0 -> 1461 bytes
 tests/ts/lscpu/dumps/x86_64-ibme326m/proc/cpuinfo  |  48 ---
 .../sys/devices/system/cpu/cpu0/cache/index0/level |   1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |   1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/level |   1 -
 .../system/cpu/cpu0/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |   1 -
 .../system/cpu/cpu0/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/level |   1 -
 .../system/cpu/cpu1/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/level |   1 -
 .../system/cpu/cpu1/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/level |   1 -
 .../system/cpu/cpu1/cache/index2/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index2/type  |   1 -
 .../devices/system/cpu/cpu1/topology/core_siblings |   1 -
 .../system/cpu/cpu1/topology/thread_siblings       |   1 -
 .../sys/devices/system/node/node0/cpu0             |   1 -
 .../sys/devices/system/node/node0/cpu1             |   1 -
 .../sys/devices/system/node/node0/cpumap           |   1 -
 tests/ts/lscpu/dumps/x86_64-necem14.tar.gz         | Bin 0 -> 1307 bytes
 tests/ts/lscpu/dumps/x86_64-necem14/proc/cpuinfo   |  46 ---
 .../sys/devices/system/cpu/cpu0/cache/index0/level |   1 -
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/level |   1 -
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu0/cache/index1/type  |   1 -
 .../devices/system/cpu/cpu0/topology/core_siblings |   1 -
 .../system/cpu/cpu0/topology/thread_siblings       |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/level |   1 -
 .../system/cpu/cpu1/cache/index0/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index0/type  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/level |   1 -
 .../system/cpu/cpu1/cache/index1/shared_cpu_map    |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/size  |   1 -
 .../sys/devices/system/cpu/cpu1/cache/index1/type  |   1 -
 .../devices/system/cpu/cpu1/topology/core_siblings |   1 -
 .../system/cpu/cpu1/topology/thread_siblings       |   1 -
 .../sys/devices/system/node/node0/cpu0             |   1 -
 .../sys/devices/system/node/node0/cpu1             |   1 -
 .../sys/devices/system/node/node0/cpumap           |   1 -
 tests/ts/lscpu/lscpu                               |  16 +-
 1207 files changed, 11 insertions(+), 2523 deletions(-)
 create mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai.tar.gz
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/topology/thread_siblings
 create mode 100644 tests/ts/lscpu/dumps/i386-dellpe700.tar.gz
 delete mode 100644 tests/ts/lscpu/dumps/i386-dellpe700/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/thermal_throttle/count
 delete mode 100644 tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/thermal_throttle/count
 delete mode 100644 tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/topology/thread_siblings
 create mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb.tar.gz
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/topology/thread_siblings
 create mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn.tar.gz
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu4
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu5
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu6
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu7
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpumap
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu0
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu1
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu2
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu3
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpumap
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node2/cpumap
 create mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620.tar.gz
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpu0
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpu1
 delete mode 100644 tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpumap
 create mode 100644 tests/ts/lscpu/dumps/ia64-pg0.tar.gz
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/level
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/size
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/type
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu0
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu1
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu2
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu3
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu4
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu5
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu6
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu7
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpumap
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu10
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu11
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu12
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu13
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu14
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu15
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu8
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu9
 delete mode 100644 tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpumap
 create mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585.tar.gz
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu0
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu12
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu4
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu8
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpumap
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu1
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu13
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu5
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu9
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpumap
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu10
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu14
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu2
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu6
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpumap
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu11
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu15
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu3
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu7
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpumap
 create mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m.tar.gz
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpu0
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpu1
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpumap
 create mode 100644 tests/ts/lscpu/dumps/x86_64-necem14.tar.gz
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/proc/cpuinfo
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/level
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/size
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/type
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/topology/core_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/topology/thread_siblings
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpu0
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpu1
 delete mode 100644 tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpumap

diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai.tar.gz b/tests/ts/lscpu/dumps/i386-amdshanghai.tar.gz
new file mode 100644
index 00000000..199c22b3
Binary files /dev/null and b/tests/ts/lscpu/dumps/i386-amdshanghai.tar.gz differ
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/proc/cpuinfo b/tests/ts/lscpu/dumps/i386-amdshanghai/proc/cpuinfo
deleted file mode 100644
index 7096d383..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/proc/cpuinfo
+++ /dev/null
@@ -1,184 +0,0 @@
-processor	: 0
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 4
-model name	: AMD Engineering Sample
-stepping	: 0
-cpu MHz		: 1995.158
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 0
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8legacy abm sse4a misalignsse 3dnowprefetch osvw ibs ts ttp tm stc 100mhzsteps hwpstate [8]
-bogomips	: 3992.50
-
-processor	: 1
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 4
-model name	: AMD Engineering Sample
-stepping	: 0
-cpu MHz		: 1995.158
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 1
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8legacy abm sse4a misalignsse 3dnowprefetch osvw ibs ts ttp tm stc 100mhzsteps hwpstate [8]
-bogomips	: 3991.05
-
-processor	: 2
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 4
-model name	: AMD Engineering Sample
-stepping	: 0
-cpu MHz		: 1995.158
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 2
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8legacy abm sse4a misalignsse 3dnowprefetch osvw ibs ts ttp tm stc 100mhzsteps hwpstate [8]
-bogomips	: 3993.85
-
-processor	: 3
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 4
-model name	: AMD Engineering Sample
-stepping	: 0
-cpu MHz		: 1995.158
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 3
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8legacy abm sse4a misalignsse 3dnowprefetch osvw ibs ts ttp tm stc 100mhzsteps hwpstate [8]
-bogomips	: 3993.27
-
-processor	: 4
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 4
-model name	: AMD Engineering Sample
-stepping	: 0
-cpu MHz		: 1995.158
-cache size	: 512 KB
-physical id	: 1
-siblings	: 4
-core id		: 0
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8legacy abm sse4a misalignsse 3dnowprefetch osvw ibs ts ttp tm stc 100mhzsteps hwpstate [8]
-bogomips	: 3990.03
-
-processor	: 5
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 4
-model name	: AMD Engineering Sample
-stepping	: 0
-cpu MHz		: 1995.158
-cache size	: 512 KB
-physical id	: 1
-siblings	: 4
-core id		: 1
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8legacy abm sse4a misalignsse 3dnowprefetch osvw ibs ts ttp tm stc 100mhzsteps hwpstate [8]
-bogomips	: 3990.09
-
-processor	: 6
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 4
-model name	: AMD Engineering Sample
-stepping	: 0
-cpu MHz		: 1995.158
-cache size	: 512 KB
-physical id	: 1
-siblings	: 4
-core id		: 2
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8legacy abm sse4a misalignsse 3dnowprefetch osvw ibs ts ttp tm stc 100mhzsteps hwpstate [8]
-bogomips	: 3990.04
-
-processor	: 7
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 4
-model name	: AMD Engineering Sample
-stepping	: 0
-cpu MHz		: 1995.158
-cache size	: 512 KB
-physical id	: 1
-siblings	: 4
-core id		: 3
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8legacy abm sse4a misalignsse 3dnowprefetch osvw ibs ts ttp tm stc 100mhzsteps hwpstate [8]
-bogomips	: 3989.99
-
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 61524e4b..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0000000f
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
deleted file mode 100644
index 0af11c55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000002
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
deleted file mode 100644
index 0af11c55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000002
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
deleted file mode 100644
index 0af11c55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000002
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
deleted file mode 100644
index 0af11c55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000002
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/topology/core_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 61524e4b..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0000000f
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 0af11c55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000002
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
deleted file mode 100644
index 5fd34aea..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000004
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
deleted file mode 100644
index 5fd34aea..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000004
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
deleted file mode 100644
index 5fd34aea..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000004
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
deleted file mode 100644
index 5fd34aea..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000004
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/topology/core_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index 61524e4b..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0000000f
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 5fd34aea..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000004
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
deleted file mode 100644
index d718dd94..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000008
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
deleted file mode 100644
index d718dd94..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000008
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
deleted file mode 100644
index d718dd94..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000008
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
deleted file mode 100644
index d718dd94..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000008
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/topology/core_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index 61524e4b..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0000000f
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index d718dd94..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000008
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
deleted file mode 100644
index eb708f55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000010
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
deleted file mode 100644
index eb708f55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000010
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
deleted file mode 100644
index eb708f55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000010
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
deleted file mode 100644
index eb708f55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000010
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/topology/core_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index 94fda38b..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000000f0
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index eb708f55..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000010
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
deleted file mode 100644
index 827aafe1..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000020
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
deleted file mode 100644
index 827aafe1..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000020
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
deleted file mode 100644
index 827aafe1..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000020
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
deleted file mode 100644
index 827aafe1..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000020
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/topology/core_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index 94fda38b..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000000f0
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 827aafe1..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000020
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
deleted file mode 100644
index 341d4992..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000040
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
deleted file mode 100644
index 341d4992..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000040
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
deleted file mode 100644
index 341d4992..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000040
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
deleted file mode 100644
index 341d4992..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000040
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/topology/core_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index 94fda38b..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000000f0
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 341d4992..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000040
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
deleted file mode 100644
index ae5f961d..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000080
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
deleted file mode 100644
index ae5f961d..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000080
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
deleted file mode 100644
index ae5f961d..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000080
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/level b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
deleted file mode 100644
index ae5f961d..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000080
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/size b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/type b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/topology/core_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index 94fda38b..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000000f0
diff --git a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index ae5f961d..00000000
--- a/tests/ts/lscpu/dumps/i386-amdshanghai/sys/devices/system/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000080
diff --git a/tests/ts/lscpu/dumps/i386-dellpe700.tar.gz b/tests/ts/lscpu/dumps/i386-dellpe700.tar.gz
new file mode 100644
index 00000000..a18a7798
Binary files /dev/null and b/tests/ts/lscpu/dumps/i386-dellpe700.tar.gz differ
diff --git a/tests/ts/lscpu/dumps/i386-dellpe700/proc/cpuinfo b/tests/ts/lscpu/dumps/i386-dellpe700/proc/cpuinfo
deleted file mode 100644
index 5e789d1e..00000000
--- a/tests/ts/lscpu/dumps/i386-dellpe700/proc/cpuinfo
+++ /dev/null
@@ -1,46 +0,0 @@
-processor	: 0
-vendor_id	: GenuineIntel
-cpu family	: 15
-model		: 2
-model name	: Intel(R) Pentium(R) 4 CPU 3.40GHz
-stepping	: 9
-cpu MHz		: 3391.773
-cache size	: 512 KB
-physical id	: 0
-siblings	: 2
-core id		: 0
-cpu cores	: 1
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 2
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid xtpr
-bogomips	: 6785.61
-
-processor	: 1
-vendor_id	: GenuineIntel
-cpu family	: 15
-model		: 2
-model name	: Intel(R) Pentium(R) 4 CPU 3.40GHz
-stepping	: 9
-cpu MHz		: 3391.773
-cache size	: 512 KB
-physical id	: 0
-siblings	: 2
-core id		: 0
-cpu cores	: 1
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 2
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid xtpr
-bogomips	: 6781.99
-
diff --git a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/thermal_throttle/count b/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/thermal_throttle/count
deleted file mode 100644
index 573541ac..00000000
--- a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/thermal_throttle/count
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index b9ad9ed2..00000000
--- a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index b9ad9ed2..00000000
--- a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/thermal_throttle/count b/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/thermal_throttle/count
deleted file mode 100644
index 573541ac..00000000
--- a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/thermal_throttle/count
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/topology/core_siblings b/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index b9ad9ed2..00000000
--- a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index b9ad9ed2..00000000
--- a/tests/ts/lscpu/dumps/i386-dellpe700/sys/devices/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb.tar.gz b/tests/ts/lscpu/dumps/i386-intels5000phb.tar.gz
new file mode 100644
index 00000000..36c98115
Binary files /dev/null and b/tests/ts/lscpu/dumps/i386-intels5000phb.tar.gz differ
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/proc/cpuinfo b/tests/ts/lscpu/dumps/i386-intels5000phb/proc/cpuinfo
deleted file mode 100644
index 9e98996c..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/proc/cpuinfo
+++ /dev/null
@@ -1,184 +0,0 @@
-processor	: 0
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 15
-model name	: Intel(R) Xeon(R) CPU           E5310  @ 1.60GHz
-stepping	: 7
-cpu MHz		: 1596.044
-cache size	: 4096 KB
-physical id	: 0
-siblings	: 4
-core id		: 0
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc pni monitor ds_cpl vmx tm2 cx16 xtpr lahf_lm
-bogomips	: 3193.91
-
-processor	: 1
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 15
-model name	: Intel(R) Xeon(R) CPU           E5310  @ 1.60GHz
-stepping	: 7
-cpu MHz		: 1596.044
-cache size	: 4096 KB
-physical id	: 0
-siblings	: 4
-core id		: 1
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc pni monitor ds_cpl vmx tm2 cx16 xtpr lahf_lm
-bogomips	: 3191.87
-
-processor	: 2
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 15
-model name	: Intel(R) Xeon(R) CPU           E5310  @ 1.60GHz
-stepping	: 7
-cpu MHz		: 1596.044
-cache size	: 4096 KB
-physical id	: 0
-siblings	: 4
-core id		: 2
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc pni monitor ds_cpl vmx tm2 cx16 xtpr lahf_lm
-bogomips	: 3191.88
-
-processor	: 3
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 15
-model name	: Intel(R) Xeon(R) CPU           E5310  @ 1.60GHz
-stepping	: 7
-cpu MHz		: 1596.044
-cache size	: 4096 KB
-physical id	: 0
-siblings	: 4
-core id		: 3
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc pni monitor ds_cpl vmx tm2 cx16 xtpr lahf_lm
-bogomips	: 3191.88
-
-processor	: 4
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 15
-model name	: Intel(R) Xeon(R) CPU           E5310  @ 1.60GHz
-stepping	: 7
-cpu MHz		: 1596.044
-cache size	: 4096 KB
-physical id	: 1
-siblings	: 4
-core id		: 0
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc pni monitor ds_cpl vmx tm2 cx16 xtpr lahf_lm
-bogomips	: 3191.90
-
-processor	: 5
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 15
-model name	: Intel(R) Xeon(R) CPU           E5310  @ 1.60GHz
-stepping	: 7
-cpu MHz		: 1596.044
-cache size	: 4096 KB
-physical id	: 1
-siblings	: 4
-core id		: 1
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc pni monitor ds_cpl vmx tm2 cx16 xtpr lahf_lm
-bogomips	: 3191.90
-
-processor	: 6
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 15
-model name	: Intel(R) Xeon(R) CPU           E5310  @ 1.60GHz
-stepping	: 7
-cpu MHz		: 1596.044
-cache size	: 4096 KB
-physical id	: 1
-siblings	: 4
-core id		: 2
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc pni monitor ds_cpl vmx tm2 cx16 xtpr lahf_lm
-bogomips	: 3191.90
-
-processor	: 7
-vendor_id	: GenuineIntel
-cpu family	: 6
-model		: 15
-model name	: Intel(R) Xeon(R) CPU           E5310  @ 1.60GHz
-stepping	: 7
-cpu MHz		: 1596.044
-cache size	: 4096 KB
-physical id	: 1
-siblings	: 4
-core id		: 3
-cpu cores	: 4
-fdiv_bug	: no
-hlt_bug		: no
-f00f_bug	: no
-coma_bug	: no
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 10
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm constant_tsc pni monitor ds_cpl vmx tm2 cx16 xtpr lahf_lm
-bogomips	: 3191.91
-
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
deleted file mode 100644
index b9ad9ed2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/size
deleted file mode 100644
index 6399ecd3..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-4096K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 61524e4b..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0000000f
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index d3476039..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
deleted file mode 100644
index 0af11c55..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000002
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
deleted file mode 100644
index 0af11c55..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000002
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
deleted file mode 100644
index b9ad9ed2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/size
deleted file mode 100644
index 6399ecd3..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-4096K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/topology/core_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 61524e4b..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0000000f
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 0af11c55..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000002
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
deleted file mode 100644
index 5fd34aea..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000004
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
deleted file mode 100644
index 5fd34aea..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000004
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
deleted file mode 100644
index de4a3657..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-0000000c
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/size
deleted file mode 100644
index 6399ecd3..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-4096K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/topology/core_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index 61524e4b..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0000000f
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 5fd34aea..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000004
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
deleted file mode 100644
index d718dd94..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000008
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
deleted file mode 100644
index d718dd94..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000008
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
deleted file mode 100644
index de4a3657..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-0000000c
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/size
deleted file mode 100644
index 6399ecd3..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-4096K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/topology/core_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index 61524e4b..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0000000f
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index d718dd94..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000008
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
deleted file mode 100644
index eb708f55..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000010
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
deleted file mode 100644
index eb708f55..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000010
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
deleted file mode 100644
index d2f53cb5..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000030
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/size
deleted file mode 100644
index 6399ecd3..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-4096K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/topology/core_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index 94fda38b..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000000f0
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index eb708f55..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000010
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
deleted file mode 100644
index 827aafe1..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000020
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
deleted file mode 100644
index 827aafe1..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000020
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
deleted file mode 100644
index d2f53cb5..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000030
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/size
deleted file mode 100644
index 6399ecd3..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-4096K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/topology/core_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index 94fda38b..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000000f0
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 827aafe1..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000020
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
deleted file mode 100644
index 341d4992..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000040
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
deleted file mode 100644
index 341d4992..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000040
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
deleted file mode 100644
index dcb914a5..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-000000c0
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/size
deleted file mode 100644
index 6399ecd3..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-4096K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/topology/core_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index 94fda38b..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000000f0
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 341d4992..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000040
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
deleted file mode 100644
index ae5f961d..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000080
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
deleted file mode 100644
index ae5f961d..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000080
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/size
deleted file mode 100644
index 56b868b2..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-32K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/level b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
deleted file mode 100644
index dcb914a5..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-000000c0
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/size b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/size
deleted file mode 100644
index 6399ecd3..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-4096K
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/type b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/topology/core_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index 94fda38b..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000000f0
diff --git a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/topology/thread_siblings b/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index ae5f961d..00000000
--- a/tests/ts/lscpu/dumps/i386-intels5000phb/sys/devices/system/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000080
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn.tar.gz b/tests/ts/lscpu/dumps/ia64-hpmatterhorn.tar.gz
new file mode 100644
index 00000000..b5f15165
Binary files /dev/null and b/tests/ts/lscpu/dumps/ia64-hpmatterhorn.tar.gz differ
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/proc/cpuinfo b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/proc/cpuinfo
deleted file mode 100644
index 24e3f1d3..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/proc/cpuinfo
+++ /dev/null
@@ -1,120 +0,0 @@
-processor  : 0
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 1
-revision   : 5
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1300.000000
-itc MHz    : 1300.000000
-BogoMIPS   : 1945.60
-siblings   : 1
-
-processor  : 1
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 1
-revision   : 5
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1300.000000
-itc MHz    : 1300.000000
-BogoMIPS   : 1945.60
-siblings   : 1
-
-processor  : 2
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 1
-revision   : 5
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1300.000000
-itc MHz    : 1300.000000
-BogoMIPS   : 1941.50
-siblings   : 1
-
-processor  : 3
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 1
-revision   : 5
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1300.000000
-itc MHz    : 1300.000000
-BogoMIPS   : 1941.50
-siblings   : 1
-
-processor  : 4
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 1
-revision   : 5
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1300.000000
-itc MHz    : 1300.000000
-BogoMIPS   : 1941.50
-siblings   : 1
-
-processor  : 5
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 1
-revision   : 5
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1300.000000
-itc MHz    : 1300.000000
-BogoMIPS   : 1945.60
-siblings   : 1
-
-processor  : 6
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 1
-revision   : 5
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1300.000000
-itc MHz    : 1300.000000
-BogoMIPS   : 1945.60
-siblings   : 1
-
-processor  : 7
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 1
-revision   : 5
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1300.000000
-itc MHz    : 1300.000000
-BogoMIPS   : 1941.50
-siblings   : 1
-
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu4 b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu4
deleted file mode 100644
index 3bbc86e4..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu4
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu4
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu5 b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu5
deleted file mode 100644
index 226ac758..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu5
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu5
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu6 b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu6
deleted file mode 100644
index 1fae7b06..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu6
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu6
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu7 b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu7
deleted file mode 100644
index 942f0f5d..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpu7
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu7
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpumap b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpumap
deleted file mode 100644
index 2482bd59..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node0/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000f0
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu0 b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu0
deleted file mode 100644
index a8c6fc85..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu0
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu0
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu1 b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu1
deleted file mode 100644
index a4064281..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu1
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu2 b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu2
deleted file mode 100644
index 782bdd65..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu2
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu3 b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu3
deleted file mode 100644
index ff189f54..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpu3
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu3
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpumap b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpumap
deleted file mode 100644
index 446e2566..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node1/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000000f
diff --git a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node2/cpumap b/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node2/cpumap
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-hpmatterhorn/sys/devices/system/node/node2/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620.tar.gz b/tests/ts/lscpu/dumps/ia64-hprx1620.tar.gz
new file mode 100644
index 00000000..37bcb17d
Binary files /dev/null and b/tests/ts/lscpu/dumps/ia64-hprx1620.tar.gz differ
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/proc/cpuinfo b/tests/ts/lscpu/dumps/ia64-hprx1620/proc/cpuinfo
deleted file mode 100644
index 1f54d464..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/proc/cpuinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-processor  : 0
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 2
-revision   : 1
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1599.000967
-itc MHz    : 1599.967674
-BogoMIPS   : 2392.06
-siblings   : 1
-
-processor  : 1
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 2
-revision   : 1
-archrev    : 0
-features   : branchlong
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1599.000967
-itc MHz    : 1599.967674
-BogoMIPS   : 2392.06
-siblings   : 1
-
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/level b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/size b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/type b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/level b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/size b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/type b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/level b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/size b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/type b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/level b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/size b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/size
deleted file mode 100644
index 07eb221f..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-3072K
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/type b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpu0 b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpu0
deleted file mode 100644
index a8c6fc85..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpu0
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu0
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpu1 b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpu1
deleted file mode 100644
index a4064281..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpu1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu1
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpumap b/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpumap
deleted file mode 100644
index 9bac1436..00000000
--- a/tests/ts/lscpu/dumps/ia64-hprx1620/sys/devices/system/node/node0/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/ia64-pg0.tar.gz b/tests/ts/lscpu/dumps/ia64-pg0.tar.gz
new file mode 100644
index 00000000..f30d792d
Binary files /dev/null and b/tests/ts/lscpu/dumps/ia64-pg0.tar.gz differ
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/proc/cpuinfo b/tests/ts/lscpu/dumps/ia64-pg0/proc/cpuinfo
deleted file mode 100644
index a07d8eab..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/proc/cpuinfo
+++ /dev/null
@@ -1,288 +0,0 @@
-processor  : 0
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 512
-core id    : 0
-thread id  : 0
-
-processor  : 1
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 512
-core id    : 1
-thread id  : 0
-
-processor  : 2
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 131587
-core id    : 0
-thread id  : 0
-
-processor  : 3
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 131587
-core id    : 1
-thread id  : 0
-
-processor  : 4
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 8389120
-core id    : 0
-thread id  : 0
-
-processor  : 5
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 8389120
-core id    : 1
-thread id  : 0
-
-processor  : 6
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2842.62
-siblings   : 2
-physical id: 8520195
-core id    : 0
-thread id  : 0
-
-processor  : 7
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 8520195
-core id    : 1
-thread id  : 0
-
-processor  : 8
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 1024
-core id    : 0
-thread id  : 0
-
-processor  : 9
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 1024
-core id    : 1
-thread id  : 0
-
-processor  : 10
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 132099
-core id    : 0
-thread id  : 0
-
-processor  : 11
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 132099
-core id    : 1
-thread id  : 0
-
-processor  : 12
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 8389632
-core id    : 0
-thread id  : 0
-
-processor  : 13
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 8389632
-core id    : 1
-thread id  : 0
-
-processor  : 14
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 8520707
-core id    : 0
-thread id  : 0
-
-processor  : 15
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium 2
-model      : 0
-revision   : 5
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1418.000227
-itc MHz    : 399.999999
-BogoMIPS   : 2834.43
-siblings   : 2
-physical id: 8520707
-core id    : 1
-thread id  : 0
-
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 9bac1436..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 9174a4f0..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 9bac1436..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 16afa03e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/shared_cpu_map
deleted file mode 100644
index d3093646..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000400
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/shared_cpu_map
deleted file mode 100644
index d3093646..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000400
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/shared_cpu_map
deleted file mode 100644
index d3093646..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000400
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/topology/core_siblings
deleted file mode 100644
index 076a1053..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000c00
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/topology/thread_siblings
deleted file mode 100644
index d3093646..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu10/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000400
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/shared_cpu_map
deleted file mode 100644
index a9d9e5d8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000800
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/shared_cpu_map
deleted file mode 100644
index a9d9e5d8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000800
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/shared_cpu_map
deleted file mode 100644
index a9d9e5d8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000800
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/topology/core_siblings
deleted file mode 100644
index 076a1053..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000c00
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/topology/thread_siblings
deleted file mode 100644
index a9d9e5d8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu11/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000800
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/shared_cpu_map
deleted file mode 100644
index 12d3fd6b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/shared_cpu_map
deleted file mode 100644
index 12d3fd6b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/shared_cpu_map
deleted file mode 100644
index 12d3fd6b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/topology/core_siblings
deleted file mode 100644
index d244892f..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00003000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/topology/thread_siblings
deleted file mode 100644
index 12d3fd6b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu12/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/shared_cpu_map
deleted file mode 100644
index dc247c36..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/shared_cpu_map
deleted file mode 100644
index dc247c36..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/shared_cpu_map
deleted file mode 100644
index dc247c36..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/topology/core_siblings
deleted file mode 100644
index d244892f..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00003000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/topology/thread_siblings
deleted file mode 100644
index dc247c36..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu13/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/shared_cpu_map
deleted file mode 100644
index 82d749f5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/shared_cpu_map
deleted file mode 100644
index 82d749f5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/shared_cpu_map
deleted file mode 100644
index 82d749f5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/topology/core_siblings
deleted file mode 100644
index 6fa6fa7d..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000c000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/topology/thread_siblings
deleted file mode 100644
index 82d749f5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu14/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/shared_cpu_map
deleted file mode 100644
index bac03df0..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/shared_cpu_map
deleted file mode 100644
index bac03df0..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/shared_cpu_map
deleted file mode 100644
index bac03df0..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/topology/core_siblings
deleted file mode 100644
index 6fa6fa7d..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000c000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/topology/thread_siblings
deleted file mode 100644
index bac03df0..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu15/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index 564fe103..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000000c
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 7bf74bad..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index 564fe103..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000000c
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index f672618b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index f440ff52..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000030
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index 9e32549b..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index f440ff52..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000030
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index ba67c0ef..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index 1f1561c9..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000c0
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 90570988..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index 1f1561c9..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000c0
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index d0710cdc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/shared_cpu_map
deleted file mode 100644
index 942d9ebc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/shared_cpu_map
deleted file mode 100644
index 942d9ebc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/shared_cpu_map
deleted file mode 100644
index 942d9ebc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/topology/core_siblings
deleted file mode 100644
index 4b517ebb..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000300
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index 942d9ebc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/shared_cpu_map
deleted file mode 100644
index aa867381..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000200
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/shared_cpu_map
deleted file mode 100644
index aa867381..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000200
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/shared_cpu_map
deleted file mode 100644
index aa867381..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000200
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/size
deleted file mode 100644
index 7a3f3736..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-256K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/level b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/shared_cpu_map b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/shared_cpu_map
deleted file mode 100644
index 2efe07b8..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/size b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/size
deleted file mode 100644
index fd6858c5..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/size
+++ /dev/null
@@ -1 +0,0 @@
-6144K
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/type b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/cache/index4/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/topology/core_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/topology/core_siblings
deleted file mode 100644
index 4b517ebb..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000300
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/topology/thread_siblings b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/topology/thread_siblings
deleted file mode 100644
index aa867381..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/cpu/cpu9/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000200
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu0 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu0
deleted file mode 100644
index a8c6fc85..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu0
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu0
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu1 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu1
deleted file mode 100644
index a4064281..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu1
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu2 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu2
deleted file mode 100644
index 782bdd65..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu2
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu3 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu3
deleted file mode 100644
index ff189f54..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu3
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu3
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu4 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu4
deleted file mode 100644
index 3bbc86e4..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu4
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu4
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu5 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu5
deleted file mode 100644
index 226ac758..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu5
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu5
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu6 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu6
deleted file mode 100644
index 1fae7b06..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu6
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu6
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu7 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu7
deleted file mode 100644
index 942f0f5d..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpu7
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu7
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpumap b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpumap
deleted file mode 100644
index 41f6ac9e..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node0/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu10 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu10
deleted file mode 100644
index 380cc4ba..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu10
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu10
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu11 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu11
deleted file mode 100644
index 5a3067b6..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu11
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu11
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu12 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu12
deleted file mode 100644
index 1b44a959..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu12
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu12
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu13 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu13
deleted file mode 100644
index abf35524..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu13
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu13
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu14 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu14
deleted file mode 100644
index 3d2f2420..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu14
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu14
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu15 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu15
deleted file mode 100644
index 0b6a8cf2..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu15
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu15
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu8 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu8
deleted file mode 100644
index 695f6cd0..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu8
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu9 b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu9
deleted file mode 100644
index 00cdda74..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpu9
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu9
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpumap b/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpumap
deleted file mode 100644
index faa27e87..00000000
--- a/tests/ts/lscpu/dumps/ia64-pg0/sys/devices/system/node/node1/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000ff00
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585.tar.gz b/tests/ts/lscpu/dumps/x86_64-hpdl585.tar.gz
new file mode 100644
index 00000000..89790b70
Binary files /dev/null and b/tests/ts/lscpu/dumps/x86_64-hpdl585.tar.gz differ
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/proc/cpuinfo b/tests/ts/lscpu/dumps/x86_64-hpdl585/proc/cpuinfo
deleted file mode 100644
index 6b0daf25..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/proc/cpuinfo
+++ /dev/null
@@ -1,384 +0,0 @@
-processor	: 0
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 0
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4423.03
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 1
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 1
-siblings	: 4
-core id		: 0
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.50
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 2
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 2
-siblings	: 4
-core id		: 0
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.55
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 3
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 3
-siblings	: 4
-core id		: 0
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.80
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 4
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 1
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.43
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 5
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 1
-siblings	: 4
-core id		: 1
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.45
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 6
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 2
-siblings	: 4
-core id		: 1
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.54
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 7
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 3
-siblings	: 4
-core id		: 1
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4421.02
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 8
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 2
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.50
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 9
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 1
-siblings	: 4
-core id		: 2
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.38
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 10
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 2
-siblings	: 4
-core id		: 2
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.26
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 11
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 3
-siblings	: 4
-core id		: 2
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.52
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 12
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 0
-siblings	: 4
-core id		: 3
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.55
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 13
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 1
-siblings	: 4
-core id		: 3
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.43
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 14
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 2
-siblings	: 4
-core id		: 3
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.52
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
-processor	: 15
-vendor_id	: AuthenticAMD
-cpu family	: 16
-model		: 2
-model name	: Quad-Core AMD Opteron(tm) Processor 8354
-stepping	: 3
-cpu MHz		: 2210.188
-cache size	: 512 KB
-physical id	: 3
-siblings	: 4
-core id		: 3
-cpu cores	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc pni cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy altmovcr8 abm sse4a misalignsse 3dnowprefetch osvw
-bogomips	: 4420.50
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index f3059d84..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001111
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
deleted file mode 100644
index 5e249253..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
deleted file mode 100644
index 5e249253..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
deleted file mode 100644
index 5e249253..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
deleted file mode 100644
index 5e249253..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 3502c18d..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002222
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 5e249253..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/shared_cpu_map
deleted file mode 100644
index d8b67036..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000400
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/shared_cpu_map
deleted file mode 100644
index d8b67036..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000400
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/shared_cpu_map
deleted file mode 100644
index d8b67036..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000400
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/shared_cpu_map
deleted file mode 100644
index d8b67036..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000400
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/topology/core_siblings
deleted file mode 100644
index b794c99b..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004444
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/topology/thread_siblings
deleted file mode 100644
index d8b67036..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu10/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000400
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/shared_cpu_map
deleted file mode 100644
index 8ab497eb..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000800
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/shared_cpu_map
deleted file mode 100644
index 8ab497eb..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000800
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/shared_cpu_map
deleted file mode 100644
index 8ab497eb..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000800
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/shared_cpu_map
deleted file mode 100644
index 8ab497eb..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000800
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/topology/core_siblings
deleted file mode 100644
index f982d9ee..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008888
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/topology/thread_siblings
deleted file mode 100644
index 8ab497eb..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu11/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000800
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/shared_cpu_map
deleted file mode 100644
index b82cc283..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/shared_cpu_map
deleted file mode 100644
index b82cc283..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/shared_cpu_map
deleted file mode 100644
index b82cc283..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/shared_cpu_map
deleted file mode 100644
index b82cc283..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/topology/core_siblings
deleted file mode 100644
index f3059d84..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001111
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/topology/thread_siblings
deleted file mode 100644
index b82cc283..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu12/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/shared_cpu_map
deleted file mode 100644
index b187b642..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/shared_cpu_map
deleted file mode 100644
index b187b642..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/shared_cpu_map
deleted file mode 100644
index b187b642..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/shared_cpu_map
deleted file mode 100644
index b187b642..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/topology/core_siblings
deleted file mode 100644
index 3502c18d..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002222
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/topology/thread_siblings
deleted file mode 100644
index b187b642..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu13/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/shared_cpu_map
deleted file mode 100644
index 29de8925..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/shared_cpu_map
deleted file mode 100644
index 29de8925..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/shared_cpu_map
deleted file mode 100644
index 29de8925..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/shared_cpu_map
deleted file mode 100644
index 29de8925..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/topology/core_siblings
deleted file mode 100644
index b794c99b..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004444
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/topology/thread_siblings
deleted file mode 100644
index 29de8925..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu14/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/shared_cpu_map
deleted file mode 100644
index a3390b3f..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/shared_cpu_map
deleted file mode 100644
index a3390b3f..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/shared_cpu_map
deleted file mode 100644
index a3390b3f..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/shared_cpu_map
deleted file mode 100644
index a3390b3f..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/topology/core_siblings
deleted file mode 100644
index f982d9ee..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008888
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/topology/thread_siblings
deleted file mode 100644
index a3390b3f..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu15/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008000
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
deleted file mode 100644
index 351374d9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
deleted file mode 100644
index 351374d9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
deleted file mode 100644
index 351374d9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
deleted file mode 100644
index 351374d9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index b794c99b..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004444
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 351374d9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
deleted file mode 100644
index 97676400..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
deleted file mode 100644
index 97676400..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
deleted file mode 100644
index 97676400..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
deleted file mode 100644
index 97676400..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index f982d9ee..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008888
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index 97676400..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
deleted file mode 100644
index 9af614a3..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
deleted file mode 100644
index 9af614a3..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
deleted file mode 100644
index 9af614a3..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
deleted file mode 100644
index 9af614a3..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index f3059d84..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001111
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index 9af614a3..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
deleted file mode 100644
index deed5585..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
deleted file mode 100644
index deed5585..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
deleted file mode 100644
index deed5585..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
deleted file mode 100644
index deed5585..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index 3502c18d..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002222
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index deed5585..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
deleted file mode 100644
index bf4f1c29..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
deleted file mode 100644
index bf4f1c29..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
deleted file mode 100644
index bf4f1c29..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
deleted file mode 100644
index bf4f1c29..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index b794c99b..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004444
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index bf4f1c29..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
deleted file mode 100644
index 92168ad9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
deleted file mode 100644
index 92168ad9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
deleted file mode 100644
index 92168ad9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
deleted file mode 100644
index 92168ad9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index f982d9ee..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008888
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index 92168ad9..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/shared_cpu_map
deleted file mode 100644
index 8607d0e4..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/shared_cpu_map
deleted file mode 100644
index 8607d0e4..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/shared_cpu_map
deleted file mode 100644
index 8607d0e4..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/shared_cpu_map
deleted file mode 100644
index 8607d0e4..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/topology/core_siblings
deleted file mode 100644
index f3059d84..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001111
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index 8607d0e4..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/shared_cpu_map
deleted file mode 100644
index 62ebad00..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000200
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/shared_cpu_map
deleted file mode 100644
index 62ebad00..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000200
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/shared_cpu_map
deleted file mode 100644
index 62ebad00..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000200
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/size
deleted file mode 100644
index 176f9414..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-512K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/level b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/level
deleted file mode 100644
index 00750edc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/level
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/shared_cpu_map
deleted file mode 100644
index 62ebad00..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000200
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/size b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/type b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/cache/index3/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/topology/core_siblings
deleted file mode 100644
index 3502c18d..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002222
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/topology/thread_siblings
deleted file mode 100644
index 62ebad00..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/cpu/cpu9/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000200
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu0 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu0
deleted file mode 100644
index a8c6fc85..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu0
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu0
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu12 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu12
deleted file mode 100644
index 1b44a959..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu12
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu12
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu4 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu4
deleted file mode 100644
index 3bbc86e4..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu4
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu4
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu8 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu8
deleted file mode 100644
index 695f6cd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpu8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu8
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpumap b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpumap
deleted file mode 100644
index f3059d84..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node0/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00001111
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu1 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu1
deleted file mode 100644
index a4064281..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu1
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu13 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu13
deleted file mode 100644
index abf35524..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu13
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu13
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu5 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu5
deleted file mode 100644
index 226ac758..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu5
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu5
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu9 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu9
deleted file mode 100644
index 00cdda74..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpu9
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu9
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpumap b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpumap
deleted file mode 100644
index 3502c18d..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node1/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00002222
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu10 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu10
deleted file mode 100644
index 380cc4ba..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu10
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu10
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu14 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu14
deleted file mode 100644
index 3d2f2420..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu14
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu14
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu2 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu2
deleted file mode 100644
index 782bdd65..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu2
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu6 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu6
deleted file mode 100644
index 1fae7b06..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpu6
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu6
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpumap b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpumap
deleted file mode 100644
index b794c99b..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node2/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00004444
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu11 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu11
deleted file mode 100644
index 5a3067b6..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu11
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu11
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu15 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu15
deleted file mode 100644
index 0b6a8cf2..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu15
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu15
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu3 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu3
deleted file mode 100644
index ff189f54..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu3
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu3
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu7 b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu7
deleted file mode 100644
index 942f0f5d..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpu7
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu7
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpumap b/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpumap
deleted file mode 100644
index f982d9ee..00000000
--- a/tests/ts/lscpu/dumps/x86_64-hpdl585/sys/devices/system/node/node3/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00008888
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m.tar.gz b/tests/ts/lscpu/dumps/x86_64-ibme326m.tar.gz
new file mode 100644
index 00000000..5aff52fd
Binary files /dev/null and b/tests/ts/lscpu/dumps/x86_64-ibme326m.tar.gz differ
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/proc/cpuinfo b/tests/ts/lscpu/dumps/x86_64-ibme326m/proc/cpuinfo
deleted file mode 100644
index 0c4c4178..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/proc/cpuinfo
+++ /dev/null
@@ -1,48 +0,0 @@
-processor	: 0
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 33
-model name	: Dual Core AMD Opteron(tm) Processor 270
-stepping	: 2
-cpu MHz		: 1995.058
-cache size	: 1024 KB
-physical id	: 0
-siblings	: 2
-core id		: 0
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt lm 3dnowext 3dnow pni lahf_lm cmp_legacy
-bogomips	: 3992.01
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp
-
-processor	: 1
-vendor_id	: AuthenticAMD
-cpu family	: 15
-model		: 33
-model name	: Dual Core AMD Opteron(tm) Processor 270
-stepping	: 2
-cpu MHz		: 1995.058
-cache size	: 1024 KB
-physical id	: 0
-siblings	: 2
-core id		: 1
-cpu cores	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 1
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt lm 3dnowext 3dnow pni lahf_lm cmp_legacy
-bogomips	: 3989.41
-TLB size	: 1024 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp
-
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 6dcc80c7..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
deleted file mode 100644
index 5e249253..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
deleted file mode 100644
index 5e249253..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/type
deleted file mode 100644
index 9a53cbfa..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Instruction
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/level b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
deleted file mode 100644
index 5e249253..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/size b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/size
deleted file mode 100644
index 94c87d3e..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/size
+++ /dev/null
@@ -1 +0,0 @@
-1024K
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/type b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/cache/index2/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 5e249253..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpu0 b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpu0
deleted file mode 100644
index a8c6fc85..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpu0
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu0
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpu1 b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpu1
deleted file mode 100644
index a4064281..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpu1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu1
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpumap b/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpumap
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-ibme326m/sys/devices/system/node/node0/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14.tar.gz b/tests/ts/lscpu/dumps/x86_64-necem14.tar.gz
new file mode 100644
index 00000000..00ed35f5
Binary files /dev/null and b/tests/ts/lscpu/dumps/x86_64-necem14.tar.gz differ
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/proc/cpuinfo b/tests/ts/lscpu/dumps/x86_64-necem14/proc/cpuinfo
deleted file mode 100644
index c224231d..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/proc/cpuinfo
+++ /dev/null
@@ -1,46 +0,0 @@
-processor	: 0
-vendor_id	: GenuineIntel
-cpu family	: 15
-model		: 4
-model name	:                   Intel(R) Xeon(TM) CPU 3.80GHz
-stepping	: 3
-cpu MHz		: 3790.599
-cache size	: 2048 KB
-physical id	: 0
-siblings	: 2
-core id		: 0
-cpu cores	: 1
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall lm constant_tsc pni monitor ds_cpl est tm2 cid cx16 xtpr
-bogomips	: 7583.88
-clflush size	: 64
-cache_alignment	: 128
-address sizes	: 36 bits physical, 48 bits virtual
-power management:
-
-processor	: 1
-vendor_id	: GenuineIntel
-cpu family	: 15
-model		: 4
-model name	:                   Intel(R) Xeon(TM) CPU 3.80GHz
-stepping	: 3
-cpu MHz		: 3790.599
-cache size	: 2048 KB
-physical id	: 0
-siblings	: 2
-core id		: 0
-cpu cores	: 1
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 5
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall lm constant_tsc pni monitor ds_cpl est tm2 cid cx16 xtpr
-bogomips	: 7579.94
-clflush size	: 64
-cache_alignment	: 128
-address sizes	: 36 bits physical, 48 bits virtual
-power management:
-
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/level b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/level
deleted file mode 100644
index d00491fd..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/level
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/size b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/size
deleted file mode 100644
index 55c7f6dc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/size
+++ /dev/null
@@ -1 +0,0 @@
-16K
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/type b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/type
deleted file mode 100644
index 0b7088ec..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index0/type
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/level b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/level
deleted file mode 100644
index 0cfbf088..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/level
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/shared_cpu_map
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/size b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/size
deleted file mode 100644
index 25d2efd0..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/size
+++ /dev/null
@@ -1 +0,0 @@
-2048K
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/type b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/type
deleted file mode 100644
index e4fd9dcc..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/cache/index1/type
+++ /dev/null
@@ -1 +0,0 @@
-Unified
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/topology/core_siblings b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/topology/thread_siblings b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpu0 b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpu0
deleted file mode 100644
index a8c6fc85..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpu0
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu0
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpu1 b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpu1
deleted file mode 100644
index a4064281..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpu1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../devices/system/cpu/cpu1
\ No newline at end of file
diff --git a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpumap b/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpumap
deleted file mode 100644
index 176d3d66..00000000
--- a/tests/ts/lscpu/dumps/x86_64-necem14/sys/devices/system/node/node0/cpumap
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/ts/lscpu/lscpu b/tests/ts/lscpu/lscpu
index 1df49616..2c7f2a45 100755
--- a/tests/ts/lscpu/lscpu
+++ b/tests/ts/lscpu/lscpu
@@ -22,17 +22,23 @@ TS_TOPDIR="$(dirname $0)/../.."
 
 ts_init "$*"
 
-for name in $(ls $TS_SELF/dumps/ | sort); do
-	path=$TS_SELF/dumps/$name
+for dump in $(ls $TS_SELF/dumps/*.tar.gz | sort); do
+	name=$(basename $dump .tar.gz)
+	dumpdir="$TS_OUTDIR/dumps"
+
 	ts_init_subtest $name
+	mkdir -p $dumpdir
+
+	tar -C $dumpdir -zxf $dump 
 
 	# Architecture information is not applicable with -s.
-	"${TS_CMD_LSCPU}" -s "${path}" | grep -v "Architecture" \
-	 >"${TS_OUTPUT}" 2>&1
+	"${TS_CMD_LSCPU}" -s "${dumpdir}/${name}" | \
+		grep -v "Architecture" >"${TS_OUTPUT}" 2>&1
 
 	echo >>"${TS_OUTPUT}"
 
-	"${TS_CMD_LSCPU}" -p -s "${path}" >>"${TS_OUTPUT}" 2>&1
+	"${TS_CMD_LSCPU}" -p -s "${dumpdir}/${name}" \
+		 >>"${TS_OUTPUT}" 2>&1
 
 	ts_finalize_subtest
 done
-- 
cgit v1.2.3


From 791ebe90506bfc374995a6fe2e08f01d274ce287 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 16:27:50 +0200
Subject: tests: fix script that creates lscpu dumps

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/ts/lscpu/mk-input.sh | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/tests/ts/lscpu/mk-input.sh b/tests/ts/lscpu/mk-input.sh
index 1b2dd0cb..ddf70ec1 100644
--- a/tests/ts/lscpu/mk-input.sh
+++ b/tests/ts/lscpu/mk-input.sh
@@ -1,16 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+# Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
 #
 # This script makes a copy of relevant files from /sys and /proc.
 # The files are usefull for lscpu(1) regression tests.
 #
-# For exmaple:
-#
-#   # mk-lscpu-input ts-lscpu-i386-coolhw
-#   # lscpu --sysroot dumps/ts-lscpu-i386-coolhw
-#
-
 progname=$(basename $0)
 
 if [ -z "$1" ]; then
@@ -19,30 +13,27 @@ if [ -z "$1" ]; then
 fi
 
 TS_NAME="$1"
-TS_INPUT="dumps/$TS_NAME"
+TS_DUMP="$TS_NAME"
 CP="cp -r --parents"
 
-mkdir -p $TS_INPUT/{proc,sys}
+mkdir -p $TS_DUMP/{proc,sys}
 
-$CP /proc/cpuinfo $TS_INPUT
+$CP /proc/cpuinfo $TS_DUMP
 
-mkdir -p $TS_INPUT/proc/bus/pci
-$CP /proc/bus/pci/devices $TS_INPUT
+mkdir -p $TS_DUMP/proc/bus/pci
+$CP /proc/bus/pci/devices $TS_DUMP
 
 if [ -d "/proc/xen" ]; then
-	mkdir -p $TS_INPUT/proc/xen
+	mkdir -p $TS_DUMP/proc/xen
 	if [ -f "/proc/xen/capabilities" ]; then
-		$CP /proc/xen/capabilities $TS_INPUT
+		$CP /proc/xen/capabilities $TS_DUMP
 	fi
 fi
 
-for c in $(ls -d /sys/devices/system/cpu/cpu[0-9]*); do
-	mkdir -p $TS_INPUT/$c
-done
-
-$CP /sys/devices/system/cpu/cpu0/topology/{thread_siblings,core_siblings} $TS_INPUT
-$CP /sys/devices/system/cpu/cpu0/cache/*/{type,level,size,shared_cpu_map} $TS_INPUT
+$CP /sys/devices/system/cpu/* $TS_DUMP
+$CP /sys/devices/system/node/*/cpumap $TS_DUMP
 
-$CP /sys/devices/system/node/*/cpumap $TS_INPUT
+tar zcvf $TS_NAME.tar.gz $TS_DUMP
+rm -rf $TS_DUMP
 
 
-- 
cgit v1.2.3


From 58e5d750ed81ec141193e38d59a47cde50c21714 Mon Sep 17 00:00:00 2001
From: Clytie Siddall <clytie@riverland.net.au>
Date: Wed, 27 May 2009 21:38:10 +0200
Subject: po: update vi.po (from translationproject.org)

---
 po/vi.po | 1798 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 786 insertions(+), 1012 deletions(-)

diff --git a/po/vi.po b/po/vi.po
index 3d9fd138..58a94bd6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.14.2-rc2\n"
+"Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
-"PO-Revision-Date: 2009-01-25 23:28+1030\n"
+"POT-Creation-Date: 2009-04-17 12:43+0200\n"
+"PO-Revision-Date: 2009-05-13 20:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -141,17 +141,17 @@ msgstr "sử dụng:\n"
 #: disk-utils/elvtune.c:53
 #, c-format
 msgid "\tNOTE: elvtune only works with 2.4 kernels\n"
-msgstr ""
+msgstr "\tGHI CHÚ : elvtune chỉ hoạt động với hạt nhân kiểu 2.4\n"
 
 #: disk-utils/elvtune.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "parse error\n"
-msgstr "lỗi tìm nơi"
+msgstr "lỗi phân tích cú pháp\n"
 
 #: disk-utils/elvtune.c:110
 #, c-format
 msgid "missing blockdevice, use -h for help\n"
-msgstr ""
+msgstr "thiếu thiết bị khối (gõ « -h » để thấy trợ giúp)\n"
 
 #: disk-utils/elvtune.c:131
 #, c-format
@@ -160,6 +160,10 @@ msgid ""
 "elvtune is only useful on older kernels;\n"
 "for 2.6 use IO scheduler sysfs tunables instead..\n"
 msgstr ""
+"\n"
+"elvtune chỉ có ích với hạt nhân cũ ;\n"
+"đối với hạt nhân 2.6, hãy thay thế bằng\n"
+"phần mềm định thời V/R sysfs tunables.\n"
 
 #: disk-utils/fdformat.c:31
 #, c-format
@@ -246,66 +250,65 @@ msgstr ""
 " tập tin\t\t tập tin để thử nghiệm\n"
 
 #: disk-utils/fsck.cramfs.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "stat failed: %s"
-msgstr "(Tập tin tiếp theo: %s)"
+msgstr "lỗi lấy trạng thái: %s"
 
 #: disk-utils/fsck.cramfs.c:168 disk-utils/fsck.cramfs.c:552
-#, fuzzy, c-format
+#, c-format
 msgid "open failed: %s"
-msgstr "openpty không thành công\n"
+msgstr "lỗi mở : %s"
 
 #: disk-utils/fsck.cramfs.c:173
 #, c-format
 msgid "ioctl failed: unable to determine device size: %s"
-msgstr ""
+msgstr "ioctl bị lỗi: không thể xác định kích cỡ thiết bị: %s"
 
 #: disk-utils/fsck.cramfs.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "not a block device or file: %s"
-msgstr "%s: không phải là thiết bị khối\n"
+msgstr "không phải thiết bị khối hay tập tin: %s"
 
 #: disk-utils/fsck.cramfs.c:185 disk-utils/fsck.cramfs.c:227
 msgid "file length too short"
-msgstr ""
+msgstr "chiều dài tập tin quá ngắn"
 
 #: disk-utils/fsck.cramfs.c:190 disk-utils/fsck.cramfs.c:198
 #: disk-utils/fsck.cramfs.c:259 disk-utils/fsck.cramfs.c:279
-#, fuzzy, c-format
+#, c-format
 msgid "read failed: %s"
-msgstr "(Tập tin tiếp theo: %s)"
+msgstr "lỗi đọc: %s"
 
 #: disk-utils/fsck.cramfs.c:208
 msgid "superblock magic not found"
-msgstr ""
+msgstr "không tìm thấy ma thuật siêu khối"
 
 #: disk-utils/fsck.cramfs.c:217
-#, fuzzy
 msgid "unsupported filesystem features"
-msgstr "Nhập loại hệ thống tập tin: "
+msgstr "gặp tính năng hệ thống tập tin không được hỗ trợ"
 
 #: disk-utils/fsck.cramfs.c:220
-#, fuzzy, c-format
+#, c-format
 msgid "superblock size (%d) too small"
-msgstr "số khối quá nhỏ"
+msgstr "kích cỡ siêu khối (%d) quá nhỏ"
 
 #: disk-utils/fsck.cramfs.c:224
 msgid "zero file count"
-msgstr ""
+msgstr "đếm số không tập tin"
 
 #: disk-utils/fsck.cramfs.c:230
-#, fuzzy, c-format
+#, c-format
 msgid "warning: file extends past end of filesystem\n"
-msgstr "Cảnh báo: phân vùng %s kéo dài quá điểm cuối đĩa\n"
+msgstr "cảnh báo: tập tin kéo dài quá điểm cuối hệ thống tập tin\n"
 
 #: disk-utils/fsck.cramfs.c:234
 #, c-format
 msgid "warning: old cramfs format\n"
-msgstr ""
+msgstr "cảnh báo : định dạng cramfs cũ\n"
 
 #: disk-utils/fsck.cramfs.c:247
 msgid "unable to test CRC: old cramfs format"
-msgstr ""
+msgstr "không thể thử CRC: định dạng cramfs cũ"
 
 #: disk-utils/fsck.cramfs.c:273 disk-utils/fsck.cramfs.c:340
 #: disk-utils/fsck.cramfs.c:478 login-utils/chfn.c:529 login-utils/chsh.c:439
@@ -314,172 +317,166 @@ msgid "malloc failed"
 msgstr "malloc không thành công"
 
 #: disk-utils/fsck.cramfs.c:298
-#, fuzzy
 msgid "crc error"
-msgstr ", lỗi"
+msgstr "lỗi crc"
 
 #: disk-utils/fsck.cramfs.c:365
-#, fuzzy
 msgid "root inode is not directory"
-msgstr "inode gốc không phải là một thư mục"
+msgstr "inode gốc không phải thư mục"
 
 #: disk-utils/fsck.cramfs.c:370
 #, c-format
 msgid "bad root offset (%lu)"
-msgstr ""
+msgstr "hiệu gốc sai (%lu)"
 
 #: disk-utils/fsck.cramfs.c:388
 msgid "data block too large"
-msgstr ""
+msgstr "khối dữ liệu quá lớn"
 
 #: disk-utils/fsck.cramfs.c:392
 #, c-format
 msgid "decompression error %p(%d): %s"
-msgstr ""
+msgstr "lỗi giải nén %p(%d): %s"
 
 #: disk-utils/fsck.cramfs.c:416
-#, fuzzy, c-format
+#, c-format
 msgid "  hole at %ld (%zd)\n"
-msgstr "phải là (%d, %d, %d)\n"
+msgstr "  gặp lỗ ở %ld (%zd)\n"
 
 #: disk-utils/fsck.cramfs.c:424 disk-utils/fsck.cramfs.c:596
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
-msgstr ""
+msgstr "  đang giải nén khối ở %ld đến %ld (%ld)\n"
 
 #: disk-utils/fsck.cramfs.c:430
-#, fuzzy, c-format
+#, c-format
 msgid "non-block (%ld) bytes"
-msgstr "Siêu khối: %zd byte\n"
+msgstr "khác khối (%ld) byte"
 
 #: disk-utils/fsck.cramfs.c:434
 #, c-format
 msgid "non-size (%ld vs %ld) bytes"
-msgstr ""
+msgstr "khác kích cỡ (%ld vs %ld) byte"
 
 #: disk-utils/fsck.cramfs.c:440
-#, fuzzy, c-format
+#, c-format
 msgid "write failed: %s"
-msgstr "(Tập tin tiếp theo: %s)"
+msgstr "lỗi ghi: %s"
 
 #: disk-utils/fsck.cramfs.c:453
-#, fuzzy, c-format
+#, c-format
 msgid "lchown failed: %s"
-msgstr "mount (gắn) không thành công"
+msgstr "lchown bị lỗi: %s"
 
 #: disk-utils/fsck.cramfs.c:459
-#, fuzzy, c-format
+#, c-format
 msgid "chown failed: %s"
-msgstr "mount (gắn) không thành công"
+msgstr "chown bị lỗi: %s"
 
 #: disk-utils/fsck.cramfs.c:466
-#, fuzzy, c-format
+#, c-format
 msgid "utime failed: %s"
-msgstr "giá trị thời gian chờ xấu: %s"
+msgstr "utime bị lỗi: %s"
 
 #: disk-utils/fsck.cramfs.c:481
 #, c-format
 msgid "directory inode has zero offset and non-zero size: %s"
-msgstr ""
+msgstr "inode thư mục có hiệu số không và kích cỡ khác số không: %s"
 
 #: disk-utils/fsck.cramfs.c:495
-#, fuzzy, c-format
+#, c-format
 msgid "mkdir failed: %s"
-msgstr "/dev: chdir() không thành công: %m"
+msgstr "mkdir bị lỗi: %s"
 
 #: disk-utils/fsck.cramfs.c:512
 msgid "filename length is zero"
-msgstr ""
+msgstr "tập tin có tên dài số không"
 
 #: disk-utils/fsck.cramfs.c:515
 msgid "bad filename length"
-msgstr ""
+msgstr "tập tin có tên dài sai"
 
 #: disk-utils/fsck.cramfs.c:522
-#, fuzzy
 msgid "bad inode offset"
-msgstr "kích cỡ inode xấu"
+msgstr "hiệu inode sai"
 
 #: disk-utils/fsck.cramfs.c:538
 msgid "file inode has zero offset and non-zero size"
-msgstr ""
+msgstr "inode tập tin có hiệu số không và kích cỡ khác số không"
 
 #: disk-utils/fsck.cramfs.c:541
 msgid "file inode has zero size and non-zero offset"
-msgstr ""
+msgstr "inode tập tin có kích cỡ số không và hiệu khác số không"
 
 #: disk-utils/fsck.cramfs.c:572
 msgid "symbolic link has zero offset"
-msgstr ""
+msgstr "liên kết tượng trưng có hiệu số không"
 
 #: disk-utils/fsck.cramfs.c:575
 msgid "symbolic link has zero size"
-msgstr ""
+msgstr "liên kết tượng trưng có kích cỡ số không"
 
 #: disk-utils/fsck.cramfs.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "size error in symlink: %s"
-msgstr "lỗi ghi nhớ %s: %s"
+msgstr "gặp lỗi kích cỡ trong liên kết tượng trưng: %s"
 
 #: disk-utils/fsck.cramfs.c:602
-#, fuzzy, c-format
+#, c-format
 msgid "symlink failed: %s"
-msgstr "fsync bị lỗi"
+msgstr "liên kết tượng trưng bị lỗi: %s"
 
 #: disk-utils/fsck.cramfs.c:614
 #, c-format
 msgid "special file has non-zero offset: %s"
-msgstr ""
+msgstr "tập tin đặc biệt có hiệu khác số không: %s"
 
 #: disk-utils/fsck.cramfs.c:626
 #, c-format
 msgid "fifo has non-zero size: %s"
-msgstr ""
+msgstr "FIFO có kích cỡ khác số không: %s"
 
 #: disk-utils/fsck.cramfs.c:632
 #, c-format
 msgid "socket has non-zero size: %s"
-msgstr ""
+msgstr "ổ cắm có kích cỡ khác số không: %s"
 
 #: disk-utils/fsck.cramfs.c:637
 #, c-format
 msgid "bogus mode: %s (%o)"
-msgstr ""
+msgstr "chế độ giả: %s (%o)"
 
 #: disk-utils/fsck.cramfs.c:647
-#, fuzzy, c-format
+#, c-format
 msgid "mknod failed: %s"
-msgstr "mount (gắn) không thành công"
+msgstr "mknod bị lỗiT: %s"
 
 #: disk-utils/fsck.cramfs.c:683
 #, c-format
 msgid "directory data start (%ld) < sizeof(struct cramfs_super) + start (%ld)"
-msgstr ""
+msgstr "đầu dữ liệu thư mục (%ld) < kích_cỡ(struct cramfs_super) + đầu (%ld)"
 
 #: disk-utils/fsck.cramfs.c:686
 #, c-format
 msgid "directory data end (%ld) != file data start (%ld)"
-msgstr ""
+msgstr "cuối dữ liệu thư mục (%ld) != đầu dữ liệu tập tin (%ld)"
 
 #: disk-utils/fsck.cramfs.c:691
-#, fuzzy
 msgid "invalid file data offset"
-msgstr "id sai: %s\n"
+msgstr "sai đặt hiệu dữ liệu tập tin"
 
 #: disk-utils/fsck.cramfs.c:715
-#, fuzzy
 msgid "failed to allocate outbuffer"
-msgstr "Không phân phối được bộ đệm.\n"
+msgstr "lỗi phân cấp vùng đệm ra"
 
 #: disk-utils/fsck.cramfs.c:728
-#, fuzzy
 msgid "compiled without -x support"
-msgstr "umount: không biên dịch hỗ trợ -f\n"
+msgstr "biên dịch mà không hỗ trợ -x"
 
 #: disk-utils/fsck.minix.c:210
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "Sử dụng: %s [-larvsmf] /dev/tên\n"
+msgstr "Sử dụng: %s [-larvsmf] /dev/TÊN\n"
 
 #: disk-utils/fsck.minix.c:326
 #, c-format
@@ -507,7 +504,7 @@ msgstr "Vùng nr >= CÁCVÙNG trong tập tin `%s'."
 
 #: disk-utils/fsck.minix.c:360 disk-utils/fsck.minix.c:383
 msgid "Remove block"
-msgstr "Xóa khối"
+msgstr "Xoá khối"
 
 #: disk-utils/fsck.minix.c:401
 #, c-format
@@ -928,18 +925,18 @@ msgid "cannot get size of %s"
 msgstr "không lấy được kích cỡ %s"
 
 #: disk-utils/mkfs.bfs.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "blocks argument too large, max is %llu"
-msgstr "tham số khối quá lớn, tối đa là %lu"
+msgstr "đối số khối quá lớn, tối đa %llu"
 
 #: disk-utils/mkfs.bfs.c:203
 msgid "too many inodes - max is 512"
-msgstr "quá nhiều inode - tối đa là 512"
+msgstr "quá nhiều inode - tối đa 512"
 
 #: disk-utils/mkfs.bfs.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "not enough space, need at least %llu blocks"
-msgstr "Không đủ chỗ trống, cần ít nhất %lu khối"
+msgstr "không đủ chỗ trống, cần ít nhất %llu khối"
 
 #: disk-utils/mkfs.bfs.c:224 fdisk/fdisk.c:2345
 #, c-format
@@ -967,14 +964,14 @@ msgid "Inodes: %d (in 1 block)\n"
 msgstr "Inode: %d (trong 1 khối)\n"
 
 #: disk-utils/mkfs.bfs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "Inodes: %d (in %lld blocks)\n"
-msgstr "Inode: %d (trong %ld khối)\n"
+msgstr "Inods: %d (trong %lld khối)\n"
 
 #: disk-utils/mkfs.bfs.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Blocks: %lld\n"
-msgstr "Khối: %ld\n"
+msgstr "Khối: %lld\n"
 
 #: disk-utils/mkfs.bfs.c:235
 #, c-format
@@ -1022,7 +1019,7 @@ msgstr ""
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
-msgstr "%s: Hết bộ nhớ.\n"
+msgstr "%s: Không đủ bộ nhớ.\n"
 
 #: disk-utils/mkfs.c:103
 #, c-format
@@ -1030,10 +1027,9 @@ msgid "mkfs (%s)\n"
 msgstr "mkfs (%s)\n"
 
 #: disk-utils/mkfs.cramfs.c:126
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"usage: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n "
-"name] dirname outfile\n"
+"usage: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n name] dirname outfile\n"
 " -h         print this help\n"
 " -v         be verbose\n"
 " -E         make all warnings errors (non-zero exit status)\n"
@@ -1048,20 +1044,23 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"Sử dụng: %s [-h] [-v] [-b cỡ_khối] [-e lần_in] [-i tập_tin] [-n tên] "
-"tên_thư_mục tập_tin_ra\n"
-" -h\t\tin ra trợ giúp này\n"
-" -v\t\tthông báo chi tiết\n"
-" -E\t\tkhiến tất cả cảnh báo thành lỗi (trạng thái thoát khác không)\n"
-" -b cỡ_khối\tsử dụng kích cỡ khối này, phải bằng kích cỡ trang\n"
-" -e lần_in\t\tđặt số lần in (một phần của fsid)\n"
-" -i tập_tin\tchèn một ảnh tập tin vào hệ thống tập tin (yêu cầu ≥ 2.4.0)\n"
+"sử dụng: %s [-h] [-v] [-b cỡ_khối] [-e bản_in] [-N về_cuối] [-i tập_tin] [-n tên] tên_thư_mục tập_tin_ra\n"
+" -h         hiển thị trợ giúp này\n"
+" -v         xuất chi tiết\n"
+" -E         làm cho mọi cảnh báo là lỗi (trạng thái thoát khác số không)\n"
+" -b cỡ_khối\tdùng kích cỡ khối này (phải bằng với kích cỡ trang)\n"
+" -e bản_in\tđặt số thứ tự bản in (phần của fsid)\n"
+" -N về_cuối\tđặt tình trạng cuối cramfs:\n"
+"\t\t\t• big\tvề cuối lớn\n"
+"\t\t\t• little\tvề cuối nhỏ\n"
+"\t\t\t• host\tmáy chủ (mặc định)\n"
+" -i tập_tin\tchèn một ảnh tập tin vào hệ thống tập tin (cần ≥2.4.0)\n"
 " -n tên\tđặt tên của hệ thống tập tin cramfs\n"
-" -p\t\tđệm theo %d byte cho mã khởi động\n"
-" -s\t\tsắp xếp các mục cho thư mục (tùy chọn cũ, bị lờ đi)\n"
-" -z\t\ttạo các hố rõ ràng (yêu cầu ≥ 2.3.39)\n"
-" tên_thư_mục\t\tgốc của hệ thống tập tin cần được nén\n"
-" tập_tin_ra \t\ttập tin chứa kết quả in ra\n"
+" -p         đệm theo %d byte cho mã khởi động\n"
+" -s         sấp xếp các mục nhập thư mục (tùy chọn cũ thì bị lờ đi)\n"
+" -z         tạo các lỗ dứt khoát (cần ≥2.3.39)\n"
+" tên_thư_mục\t\tgốc của hệ thống tập tin cần nén\n"
+" tập_tin_ra\t\ttập tin kết xuất\n"
 
 #: disk-utils/mkfs.cramfs.c:340
 #, c-format
@@ -1070,8 +1069,7 @@ msgid ""
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
 "Tìm thấy tên tập tin rất dài (%zu bytes) « %s ».\n"
-" Xin hãy tăng giá trị « MAX_INPUT_NAMELEN » trong tập tin « mkcramfs.c » rồi "
-"biên dịch lại.  Đang thoát.\n"
+" Xin hãy tăng giá trị « MAX_INPUT_NAMELEN » trong tập tin « mkcramfs.c » rồi biên dịch lại.  Đang thoát.\n"
 
 #: disk-utils/mkfs.cramfs.c:472
 #, c-format
@@ -1090,12 +1088,8 @@ msgstr "%6.2f%% (%+ld byte)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:854
 #, c-format
-msgid ""
-"warning: guestimate of required size (upper bound) is %lldMB, but maximum "
-"image size is %uMB.  We might die prematurely.\n"
-msgstr ""
-"cảnh báo : số ước lượng của kích cỡ yêu cầu (giới hạn trên) là %lld MB, "
-"nhưng kích cỡ ảnh lớn nhất là %u MB.  Chúng ta có thể chết non.\n"
+msgid "warning: guestimate of required size (upper bound) is %lldMB, but maximum image size is %uMB.  We might die prematurely.\n"
+msgstr "cảnh báo : số ước lượng của kích cỡ yêu cầu (giới hạn trên) là %lld MB, nhưng kích cỡ ảnh lớn nhất là %u MB.  Chúng ta có thể chết non.\n"
 
 #: disk-utils/mkfs.cramfs.c:881
 msgid "ROM image map"
@@ -1157,19 +1151,13 @@ msgstr "cảnh báo : kích cỡ tập tin bị cắt ngắn thành %luMB (trừ
 
 #: disk-utils/mkfs.cramfs.c:958
 #, c-format
-msgid ""
-"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr ""
-"cảnh báo : UID bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo "
-"mật.)\n"
+msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "cảnh báo : UID bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo mật.)\n"
 
 #: disk-utils/mkfs.cramfs.c:963
 #, c-format
-msgid ""
-"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr ""
-"cảnh báo : GID bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo "
-"mật.)\n"
+msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "cảnh báo : GID bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo mật.)\n"
 
 #: disk-utils/mkfs.cramfs.c:968
 #, c-format
@@ -1177,8 +1165,7 @@ msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
 "that some device files will be wrong.\n"
 msgstr ""
-"CẢNH BÁO : số thiết bị cắt ngắn thành %u bit.  Điều này gần chắc chắn có "
-"nghĩa là\n"
+"CẢNH BÁO : số thiết bị cắt ngắn thành %u bit.  Điều này gần chắc chắn có nghĩa là\n"
 "một vài tập tin thiết bị sẽ bị hỏng.\n"
 
 #: disk-utils/mkfs.minix.c:156
@@ -1193,8 +1180,7 @@ msgstr "%s đã được gắn, sẽ không tạo hệ thống tập tin ở đ
 
 #: disk-utils/mkfs.minix.c:190
 msgid "seek to boot block failed in write_tables"
-msgstr ""
-"tìm tới khối khởi động không thành công trong write_tables (ghi các bảng)"
+msgstr "tìm tới khối khởi động không thành công trong write_tables (ghi các bảng)"
 
 #: disk-utils/mkfs.minix.c:192
 msgid "unable to clear boot sector"
@@ -1333,8 +1319,7 @@ msgstr "Kích cỡ trang do người dùng chỉ ra xấu %d\n"
 #: disk-utils/mkswap.c:159
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
-msgstr ""
-"Sử dụng kích cỡ trang do người dùng chỉ ra %d, thay cho giá trị hệ thống %d\n"
+msgstr "Sử dụng kích cỡ trang do người dùng chỉ ra %d, thay cho giá trị hệ thống %d\n"
 
 #: disk-utils/mkswap.c:183
 #, c-format
@@ -1357,11 +1342,9 @@ msgid "no uuid\n"
 msgstr "không uuid\n"
 
 #: disk-utils/mkswap.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
-msgstr ""
-"Sử dụng: %s [-c] [-v0|-v1] [-pKÍCH_CỠ_TRANG] [-L nhãn] [-U UUID] /dev/tên "
-"[các_khối]\n"
+msgstr "Sử dụng: %s [-c] [-pKÍCH_CỠ_TRANG] [-L nhãn] [-U UUID] /dev/tên [các_khối]\n"
 
 #: disk-utils/mkswap.c:286
 msgid "too many bad pages"
@@ -1370,7 +1353,7 @@ msgstr "quá nhiều trang xấu"
 #: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
-msgstr "Tràn bộ nhớ"
+msgstr "Không đủ bộ nhớ"
 
 #: disk-utils/mkswap.c:313
 #, c-format
@@ -1387,24 +1370,23 @@ msgid "unable to rewind swap-device"
 msgstr "không thể « tua lại » thiết bị trao đổi"
 
 #: disk-utils/mkswap.c:412
-#, fuzzy
 msgid "unable to erase bootbits sectors"
-msgstr "không xóa được rãnh ghi khởi động"
+msgstr "không xoá được rãnh ghi bit khởi động"
 
 #: disk-utils/mkswap.c:416
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
-msgstr ""
+msgstr "%s: %s: cảnh báo : đừng xoá rãnh ghi bit khởi động\n"
 
 #: disk-utils/mkswap.c:419
-#, fuzzy, c-format
+#, c-format
 msgid "        (%s partition table detected). "
-msgstr "   p   in ra bảng phân vùng BSD"
+msgstr "        (%s phát hiện được bảng phân vùng). "
 
 #: disk-utils/mkswap.c:421
-#, fuzzy, c-format
+#, c-format
 msgid "        on whole disk. "
-msgstr "   s   hiển thị nhãn đĩa đầy đủ"
+msgstr "        trên toàn đĩa. "
 
 #: disk-utils/mkswap.c:491
 #, c-format
@@ -1412,13 +1394,13 @@ msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr "%1$s: cảnh báo : bỏ qua « -U » (UUID không phải được %1$s hỗ trợ)\n"
 
 #: disk-utils/mkswap.c:507
-#, fuzzy, c-format
+#, c-format
 msgid "%s: does not support swapspace version %d.\n"
-msgstr "%s: lỗi: không rõ phiên bản %d\n"
+msgstr "%s: không hỗ trợ vùng trao đổi phiên bản %d.\n"
 
 #: disk-utils/mkswap.c:515
 msgid "error: UUID parsing failed"
-msgstr "lỗi: không phân tích được UUID"
+msgstr "lỗi: không phân tích được cú pháp của UUID"
 
 #: disk-utils/mkswap.c:525
 #, c-format
@@ -1426,9 +1408,9 @@ msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: lỗi: không có chỗ nào để thiết lập bộ nhớ trao đổi ?\n"
 
 #: disk-utils/mkswap.c:543
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
-msgstr "%s: lỗi: kích cỡ %lu KiB lớn hơn kích cỡ thiết bị %lu KiB\n"
+msgstr "%s: lỗi: kích cỡ %llu KiB lớn hơn kích cỡ thiết bị %llu KiB\n"
 
 #: disk-utils/mkswap.c:552
 #, c-format
@@ -1436,9 +1418,9 @@ msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: lỗi: vùng trao đổi cần ít nhất %ld KiB\n"
 
 #: disk-utils/mkswap.c:569
-#, fuzzy, c-format
+#, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
-msgstr "%s: cảnh báo : đang cắt ngắn vùng trao đổi thành %ld KiB\n"
+msgstr "%s: cảnh báo : đang cắt ngắn vùng trao đổi thành %llu KiB\n"
 
 #: disk-utils/mkswap.c:592
 #, c-format
@@ -1455,9 +1437,9 @@ msgid "Unable to set up swap-space: unreadable"
 msgstr "Không thể thiết lập vùng trao đổi: không thể đọc"
 
 #: disk-utils/mkswap.c:617
-#, fuzzy, c-format
+#, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
-msgstr "Đang thiết lập vùng trao đổi phiên bản %d, kích cỡ = %llu KiB\n"
+msgstr "Đang thiết lập vùng trao đổi phiên bản 1, kích cỡ = %llu KiB\n"
 
 #: disk-utils/mkswap.c:628
 #, c-format
@@ -1491,62 +1473,63 @@ msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: không thể đổi nhãn của %s thành %s: %s\n"
 
 #: disk-utils/raw.c:50
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage:\n"
 "  %s "
-msgstr "Sử dụng:\n"
+msgstr ""
+"Sử dụng:\n"
+"  %s "
 
 #: disk-utils/raw.c:122
 #, c-format
-msgid ""
-"Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
-msgstr ""
+msgid "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
+msgstr "Thiết bị « %s » là thiết bị thô điều khiển (hãy dùng thô<N> mà <N> lớn hơn số không)\n"
 
 #: disk-utils/raw.c:130
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "không thể lấy trạng thái về thiết bị %s"
+msgstr "Không tìm thấy thiết bị thô « %s » (%s)\n"
 
 #: disk-utils/raw.c:136
-#, fuzzy, c-format
+#, c-format
 msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: không phải thiết bị ký tự"
+msgstr "Thiết bị thô « %s » không phải một thiết bị ký tự\n"
 
 #: disk-utils/raw.c:141
-#, fuzzy, c-format
+#, c-format
 msgid "Device '%s' is not a raw dev\n"
-msgstr "%s không phải là dòng nối tiếp"
+msgstr "Thiết bị « %s » không phải một thiết bị thô\n"
 
 #: disk-utils/raw.c:162
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
-msgstr "Không khóa được tập tin khóa (lock file) %s: %s\n"
+msgstr "Không tìm thấy thiết bị khối « %s » (%s)\n"
 
 #: disk-utils/raw.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "Device '%s' is not a block dev\n"
-msgstr "Cảnh báo: %s không phải là thiết bị khối\n"
+msgstr "Thiết bị « %s » không phải một thiết bị khối\n"
 
 #: disk-utils/raw.c:203
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open master raw device '"
-msgstr "không thể lấy trạng thái về thiết bị %s"
+msgstr "Không thể mở thiết bị thô chủ '"
 
 #: disk-utils/raw.c:225
 #, c-format
 msgid "Error querying raw device (%s)\n"
-msgstr ""
+msgstr "Lỗi hỏi thiết bị thô (%s)\n"
 
 #: disk-utils/raw.c:235 disk-utils/raw.c:255
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
-msgstr ""
+msgstr "thô%d:\tđóng kết với chính %d, phụ %d\n"
 
 #: disk-utils/raw.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Error setting raw device (%s)\n"
-msgstr "lỗi dừng dịch vụ: \"%s\""
+msgstr "Lỗi đặt thiết bị thô (%s)\n"
 
 #: fdisk/cfdisk.c:376 fdisk/cfdisk.c:2080
 msgid "Unusable"
@@ -1600,8 +1583,7 @@ msgstr "Đĩa đã được thay đổi.\n"
 #: fdisk/cfdisk.c:413
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
-msgstr ""
-"Khởi động lại hệ thống để đảm bảo là bảng phân vùng được cập nhật đúng.\n"
+msgstr "Khởi động lại hệ thống để đảm bảo là bảng phân vùng được cập nhật đúng.\n"
 
 #: fdisk/cfdisk.c:417
 #, c-format
@@ -1673,13 +1655,11 @@ msgid "enlarged logical partitions overlap"
 msgstr "phân vùng lôgíc mở rộng chồng lên nhau"
 
 #: fdisk/cfdisk.c:999
-msgid ""
-"!!!! Internal error creating logical drive with no extended partition !!!!"
+msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr "!!!! Lỗi nội bộ khi tạo các ổ lôgíc mà không có phân vùng mở rộng !!!!"
 
 #: fdisk/cfdisk.c:1010 fdisk/cfdisk.c:1022
-msgid ""
-"Cannot create logical drive here -- would create two extended partitions"
+msgid "Cannot create logical drive here -- would create two extended partitions"
 msgstr "Không thể tạo ổ lôgíc ở đây -- vì như thế sẽ tạo hai phân vùng mở rộng"
 
 #: fdisk/cfdisk.c:1164
@@ -1688,8 +1668,7 @@ msgstr "Mục trình đơn quá dài. Trình đơn có thể trông lạc lõng.
 
 #: fdisk/cfdisk.c:1220
 msgid "Menu without direction. Defaulting to horizontal."
-msgstr ""
-"Trình đơn không có phương hướng nên dùng thiết lập mặc định (nằm ngang)."
+msgstr "Trình đơn không có phương hướng nên dùng thiết lập mặc định (nằm ngang)."
 
 #: fdisk/cfdisk.c:1351
 msgid "Illegal key"
@@ -1786,11 +1765,8 @@ msgid "Opened disk read-only - you have no permission to write"
 msgstr "Mở đĩa chỉ đọc - bạn không có quyền ghi"
 
 #: fdisk/cfdisk.c:1682
-msgid ""
-"Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
-msgstr ""
-"Cảnh báo :  phát hiện GPT (bảng phân vùng GUID) không được hỗ trợ. Hãy dùng "
-"chương trình GNU Parted."
+msgid "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
+msgstr "Cảnh báo :  phát hiện GPT (bảng phân vùng GUID) không được hỗ trợ. Hãy dùng chương trình GNU Parted."
 
 #: fdisk/cfdisk.c:1701
 msgid "Cannot get disk size"
@@ -1809,8 +1785,7 @@ msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Cảnh báo : có thể sẽ xóa hết dữ liệu trên đĩa của bạn."
 
 #: fdisk/cfdisk.c:1876
-msgid ""
-"Are you sure you want to write the partition table to disk? (yes or no): "
+msgid "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr "Bạn có chắc muốn ghi bảng phân vùng lên đĩa không? (có hoặc không): "
 
 #: fdisk/cfdisk.c:1882
@@ -1838,26 +1813,16 @@ msgid "Wrote partition table to disk"
 msgstr "Đã ghi bảng phân vùng lên đĩa"
 
 #: fdisk/cfdisk.c:1923
-#, fuzzy
-msgid ""
-"Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
-"(8) or reboot to update table."
-msgstr ""
-"Đã ghi bảng phân vùng, nhưng việc đọc lại thất bại.  Hãy khởi động lại để "
-"cập nhật bảng."
+msgid "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx(8) or reboot to update table."
+msgstr "Đã ghi bảng phân vùng, nhưng không đọc lại được bảng.  Hãy chạy công cụ partprobe(8) hay kpartx(8), hoặc khởi động lại để cập nhật bảng."
 
 #: fdisk/cfdisk.c:1933
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr ""
-"Không có phân vùng chính nào được đánh dấu có thể khởi động. MBR (mục ghi "
-"khởi động chủ) của DOS không thể khởi động trong trường hợp này."
+msgstr "Không có phân vùng chính nào được đánh dấu có thể khởi động. MBR (mục ghi khởi động chủ) của DOS không thể khởi động trong trường hợp này."
 
 #: fdisk/cfdisk.c:1935
-msgid ""
-"More than one primary partition is marked bootable. DOS MBR cannot boot this."
-msgstr ""
-"Có vài phân vùng chính được đánh dấu là có thể khởi động. MBR (mục ghi khởi "
-"động chủ) của DOS không thể khởi động trong trường hợp này."
+msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr "Có vài phân vùng chính được đánh dấu là có thể khởi động. MBR (mục ghi khởi động chủ) của DOS không thể khởi động trong trường hợp này."
 
 #: fdisk/cfdisk.c:1993 fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 msgid "Enter filename or press RETURN to display on screen: "
@@ -1926,20 +1891,12 @@ msgid "               First       Last\n"
 msgstr "               Đầu         Cuối\n"
 
 #: fdisk/cfdisk.c:2134
-msgid ""
-" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
-"Flag\n"
-msgstr ""
-" # Loại       Rãnh ghi      Rãnh ghi   Hiệu    Độ dài    Kiểu hệ thống tập "
-"tin (ID) Cờ\n"
+msgid " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) Flag\n"
+msgstr " # Loại       Rãnh ghi      Rãnh ghi   Hiệu    Độ dài    Kiểu hệ thống tập tin (ID) Cờ\n"
 
 #: fdisk/cfdisk.c:2135
-msgid ""
-"-- ------- ----------- ----------- ------ ----------- -------------------- "
-"----\n"
-msgstr ""
-"-- ------- ----------- ----------- ------ ----------- -------------------- "
-"----\n"
+msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
+msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
 
 #: fdisk/cfdisk.c:2218
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
@@ -1951,8 +1908,7 @@ msgstr " #Cờ Rãnh Đầu  Trụ   ID  Rãnh Đầu  Trụ     Rãnh ghi    R
 
 #: fdisk/cfdisk.c:2220
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
-msgstr ""
-"-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
 #: fdisk/cfdisk.c:2253
 msgid "Raw"
@@ -2020,9 +1976,7 @@ msgstr "  d          Xóa phân vùng hiện thời"
 
 #: fdisk/cfdisk.c:2296
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
-msgstr ""
-"   g          Thay đổi các tham số : cylinders (hình trụ), heads (đầu đọc), "
-"sectors-per-track (số rãnh ghi trên mỗi rãnh)"
+msgstr "   g          Thay đổi các tham số : cylinders (hình trụ), heads (đầu đọc), sectors-per-track (số rãnh ghi trên mỗi rãnh)"
 
 #: fdisk/cfdisk.c:2297
 msgid "             WARNING: This option should only be used by people who"
@@ -2066,8 +2020,7 @@ msgstr "             mà bạn có thể chọn:"
 
 #: fdisk/cfdisk.c:2307
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr ""
-"                r - Dữ liệu thô (là những gì chính xác sẽ được ghi lên đĩa)"
+msgstr "                r - Dữ liệu thô (là những gì chính xác sẽ được ghi lên đĩa)"
 
 #: fdisk/cfdisk.c:2308
 msgid "                s - Table ordered by sectors"
@@ -2155,7 +2108,7 @@ msgstr "Thay đổi cấu trúc rãnh ghi"
 
 #: fdisk/cfdisk.c:2358
 msgid "Done"
-msgstr "Xong"
+msgstr "Hoàn tất"
 
 #: fdisk/cfdisk.c:2358
 msgid "Done with changing geometry"
@@ -2285,11 +2238,11 @@ msgstr "Bặt tắt khả năng khởi động của phân vùng hiện thời"
 
 #: fdisk/cfdisk.c:2745
 msgid "Delete"
-msgstr "Xóa"
+msgstr "Xoá"
 
 #: fdisk/cfdisk.c:2745
 msgid "Delete the current partition"
-msgstr "Xóa phân vùng hiện thời"
+msgstr "Xoá phân vùng hiện thời"
 
 #: fdisk/cfdisk.c:2746
 msgid "Geometry"
@@ -2313,9 +2266,7 @@ msgstr "Lớn nhất"
 
 #: fdisk/cfdisk.c:2748
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr ""
-"Đặt phân vùng hiện thời dùng vùng lớn nhất có thể trên đĩa (chỉ dành cho "
-"người có kinh nghiệm)"
+msgstr "Đặt phân vùng hiện thời dùng vùng lớn nhất có thể trên đĩa (chỉ dành cho người có kinh nghiệm)"
 
 #: fdisk/cfdisk.c:2749
 msgid "New"
@@ -2684,8 +2635,7 @@ msgstr ""
 #: fdisk/fdiskbsdlabel.c:356
 #, c-format
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr ""
-"#       đầu        cuối     kích cỡ     hệthống   [cỡ_tệp cỡ_khối   cpg]\n"
+msgstr "#       đầu        cuối     kích cỡ     hệthống   [cỡ_tệp cỡ_khối   cpg]\n"
 
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
@@ -2828,8 +2778,7 @@ msgstr ""
 "V.d.: fdisk /dev/hda  (cho đĩa IDE đầu tiên)\n"
 "  hay: fdisk /dev/sdc  (cho đĩa SCSI thứ ba)\n"
 "  hay: fdisk /dev/eda  (cho ổ PS/2 ESDI đầu tiên)\n"
-"  hay: fdisk /dev/rd/c0d0  hay: fdisk /dev/ida/c0d0  (cho các thiết bị "
-"RAID)\n"
+"  hay: fdisk /dev/rd/c0d0  hay: fdisk /dev/ida/c0d0  (cho các thiết bị RAID)\n"
 "  ...\n"
 
 #: fdisk/fdisk.c:265
@@ -3038,7 +2987,7 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 "\n"
-"Số cylinder cho đĩa này được đặt thành %d.\n"
+"Số trụ cho đĩa này được đặt thành %d.\n"
 "Không có gì sai, nhưng số này lớn hơn 1024,\n"
 "và có thể tạo vấn đề với:\n"
 "1) phần mềm chạy tại thời điểm khởi động (v.d., phiên bản LILO cũ)\n"
@@ -3055,11 +3004,17 @@ msgid ""
 "partition table format (GPT).\n"
 "\n"
 msgstr ""
+"\n"
+"CẢNH BÁO : đĩa này có kích cỡ %d.%d TB (%llu byte).\n"
+"Định dạng bảng phân vùng DOS không dùng được\n"
+"trên ổ đĩa có khối tin lớn hơn (%llu byte) cho rãnh ghi %d-byte.\n"
+"Hãy dùng công cụ parted(1) và định dạng bảng phân vùng GUID (GPT).\n"
+"\n"
 
 #: fdisk/fdisk.c:708
 #, c-format
 msgid "Bad offset in primary extended partition\n"
-msgstr "Offset xấu trong phân vùng mở rộng chính\n"
+msgstr "Hiệu sai trong phân vùng mở rộng chính\n"
 
 #: fdisk/fdisk.c:722
 #, c-format
@@ -3130,9 +3085,7 @@ msgstr ""
 
 #: fdisk/fdisk.c:1032
 #, c-format
-msgid ""
-"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
-"disklabel\n"
+msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
 msgstr "Thiết bị chứa một bảng phân vùng DOS, hay Sun, SGI hay OSF bị lỗi\n"
 
 #: fdisk/fdisk.c:1049
@@ -3147,12 +3100,8 @@ msgstr "Bỏ qua các phân vùng mở rộng dự phòng %d\n"
 
 #: fdisk/fdisk.c:1074
 #, c-format
-msgid ""
-"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
-"(rite)\n"
-msgstr ""
-"Cảnh báo : cờ 0x%04x của bảng phân vùng %d bị lỗi sẽ được sửa bởi w(rite) "
-"(ghi nhớ)\n"
+msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
+msgstr "Cảnh báo : cờ 0x%04x của bảng phân vùng %d bị lỗi sẽ được sửa bởi w(rite) (ghi nhớ)\n"
 
 #: fdisk/fdisk.c:1096
 #, c-format
@@ -3318,8 +3267,7 @@ msgstr "Kiểu hệ thống của phân vùng %d chưa thay đổi: %x (%s)\n"
 #: fdisk/fdisk.c:1591
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
-msgstr ""
-"Phân vùng %d có điểm khởi đầu vật lý/lôgíc khác nhay (không phải Linux?):\n"
+msgstr "Phân vùng %d có điểm khởi đầu vật lý/lôgíc khác nhay (không phải Linux?):\n"
 
 #: fdisk/fdisk.c:1593 fdisk/fdisk.c:1601 fdisk/fdisk.c:1610 fdisk/fdisk.c:1620
 #, c-format
@@ -3417,7 +3365,7 @@ msgstr ""
 #: fdisk/fdisk.c:1826
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
-msgstr "%*s  Khởiđộng    Đầu       Cuối      Khối      Id  Hệ thống\n"
+msgstr "%*s  Khởi_động    Đầu       Cuối      Khối      Id  Hệ_thống\n"
 
 #: fdisk/fdisk.c:1827 fdisk/fdisksgilabel.c:223 fdisk/fdisksunlabel.c:603
 msgid "Device"
@@ -3446,7 +3394,7 @@ msgstr ""
 #: fdisk/fdisk.c:1876
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
-msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Đầu      Kíchthước ID\n"
+msgstr "Nr AF  Đầu Rãnh Trụ  Đầu Rãnh Trụ     Bắt_đầu      Cỡ ID\n"
 
 #: fdisk/fdisk.c:1922
 #, c-format
@@ -3494,20 +3442,19 @@ msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Phân vùng lôgíc %d không hoàn toàn trong phân vùng %d\n"
 
 #: fdisk/fdisk.c:2007
-#, fuzzy, c-format
+#, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
-msgstr "Tổng số rãnh ghi phân phối %ld lớn hơn tối đa %lld\n"
+msgstr "Tổng số rãnh ghi phân phối %llu lớn hơn tối đa %llu\n"
 
 #: fdisk/fdisk.c:2010
-#, fuzzy, c-format
+#, c-format
 msgid "%lld unallocated %d-byte sectors\n"
-msgstr "%lld rãnh ghi không được phân phối\n"
+msgstr "%lld rãnh ghi %d-byte không được phân phối\n"
 
 #: fdisk/fdisk.c:2025 fdisk/fdisksgilabel.c:633 fdisk/fdisksunlabel.c:416
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr ""
-"Phân vùng %d đã được xác định.  Hãy xóa nó trước khi thêm lại lần nữa\n"
+msgstr "Phân vùng %d đã được xác định.  Hãy xóa nó trước khi thêm lại lần nữa\n"
 
 #: fdisk/fdisk.c:2067
 #, c-format
@@ -3604,7 +3551,7 @@ msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Gọi ioctl() để đọc lại bảng phân vùng.\n"
 
 #: fdisk/fdisk.c:2296
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "WARNING: Re-reading the partition table failed with error %d: %s.\n"
@@ -3612,9 +3559,10 @@ msgid ""
 "the next reboot or after you run partprobe(8) or kpartx(8)\n"
 msgstr ""
 "\n"
-"CẢNH BÁO: Không thể đọc lại bảng phân vùng với lỗi %d: %s.\n"
-"Nhân vẫn đang dùng bảng cũ.\n"
-"Bảng mới sẽ được sử dụng tại lần khởi động tiếp theo.\n"
+"CẢNH BÁO: thao tác đọc lại bảng phân vùng không thành công (lỗi %d): %s.\n"
+"Hạt nhân vẫn còn dùng bảng cũ.\n"
+"Bảng mới sẽ được dùng lần kế tiếp khởi động,\n"
+"hoặc sau khi bạn chạy công cụ partprobe(8) hay kpartx(8).\n"
 
 #: fdisk/fdisk.c:2304
 #, c-format
@@ -3636,12 +3584,12 @@ msgid ""
 "Error closing file\n"
 msgstr ""
 "\n"
-"Lỗi đóng tậ p tin\n"
+"Lỗi đóng tập tin\n"
 
 #: fdisk/fdisk.c:2314
 #, c-format
 msgid "Syncing disks.\n"
-msgstr "Đồng bộ đĩa.\n"
+msgstr "Đang đồng bộ hoá các đĩa.\n"
 
 #: fdisk/fdisk.c:2361
 #, c-format
@@ -3677,13 +3625,11 @@ msgstr "Cảnh báo : thiết lập hiệu số rãnh ghi cho tương thích DOS
 #, c-format
 msgid ""
 "\n"
-"WARNING: GPT (GUID Partition Table) detected on '%s'! The util fdisk doesn't "
-"support GPT. Use GNU Parted.\n"
+"WARNING: GPT (GUID Partition Table) detected on '%s'! The util fdisk doesn't support GPT. Use GNU Parted.\n"
 "\n"
 msgstr ""
 "\n"
-"CẢNH BÁO : phát hiện GPT (bảng phân vùng GUID) trên « %s ». Tiện ích fdisk "
-"không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
+"CẢNH BÁO : phát hiện GPT (bảng phân vùng GUID) trên « %s ». Tiện ích fdisk không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
 "\n"
 
 #: fdisk/fdisk.c:2533
@@ -3696,7 +3642,7 @@ msgstr "Đĩa %s không chứa một bảng phân vùng hợp lệ\n"
 msgid "Cannot open %s\n"
 msgstr "Không thể mở %s\n"
 
-#: fdisk/fdisk.c:2563 fdisk/sfdisk.c:2618
+#: fdisk/fdisk.c:2563 fdisk/sfdisk.c:2617
 #, c-format
 msgid "cannot open %s\n"
 msgstr "không thể mở %s\n"
@@ -3713,12 +3659,8 @@ msgstr "Nhân này tự tìm kích cỡ rãnh ghi - tùy chọn -b bị bỏ qua
 
 #: fdisk/fdisk.c:2657
 #, c-format
-msgid ""
-"Warning: the -b (set sector size) option should be used with one specified "
-"device\n"
-msgstr ""
-"Cảnh báo: tùy chọn -b (đặt kích cỡ rãnh ghi) cần sử dụng với một thiết bị "
-"xác định\n"
+msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
+msgstr "Cảnh báo: tùy chọn -b (đặt kích cỡ rãnh ghi) cần sử dụng với một thiết bị xác định\n"
 
 #: fdisk/fdisk.c:2717
 #, c-format
@@ -3856,12 +3798,8 @@ msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:164
 #, c-format
-msgid ""
-"According to MIPS Computer Systems, Inc the Label must not contain more than "
-"512 bytes\n"
-msgstr ""
-"Tùy theo MIPS Computer Systems, Inc. thì Nhãn không được chứa nhiều hơn 512 "
-"byte\n"
+msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
+msgstr "Tùy theo MIPS Computer Systems, Inc. thì Nhãn không được chứa nhiều hơn 512 byte\n"
 
 #: fdisk/fdisksgilabel.c:183
 #, c-format
@@ -4143,11 +4081,9 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:731 fdisk/fdisksunlabel.c:227
 #, c-format
 msgid ""
-"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
-"d.\n"
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
-msgstr ""
-"Cảnh báo: BLKGETSIZE ioctl lỗi trên %s. Sử dụng giá trị cấu trúc trụ là %d.\n"
+msgstr "Cảnh báo: BLKGETSIZE ioctl lỗi trên %s. Sử dụng giá trị cấu trúc trụ là %d.\n"
 
 #: fdisk/fdisksgilabel.c:745
 #, c-format
@@ -4237,11 +4173,8 @@ msgstr "Tìm thấy nhãn đĩa Sun với số phân vùng (num_partitions) sai
 
 #: fdisk/fdisksunlabel.c:168
 #, c-format
-msgid ""
-"Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
-msgstr ""
-"Cảnh báo : các giá trị không đúng cần phải được sửa chữa nên sẽ được sửa bởi "
-"w(rite) (ghi nhớ)\n"
+msgid "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
+msgstr "Cảnh báo : các giá trị không đúng cần phải được sửa chữa nên sẽ được sửa bởi w(rite) (ghi nhớ)\n"
 
 #: fdisk/fdisksunlabel.c:198
 #, c-format
@@ -4532,7 +4465,7 @@ msgstr "QNX4.x phần 3"
 
 #: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
-msgstr "OnRãnh DM"
+msgstr "OnTrack DM"
 
 #: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
@@ -4548,7 +4481,7 @@ msgstr "OnTrack DM6 Aux3"
 
 #: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
-msgstr "OnRãnhDM6"
+msgstr "OnTrackDM6"
 
 #: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
@@ -4605,7 +4538,7 @@ msgstr "OS/2 ổ đĩa C: ẩn"
 
 #: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
-msgstr "Mở rộng Linux"
+msgstr "Linux mở rộng"
 
 #: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
@@ -4613,7 +4546,7 @@ msgstr "Bộ khối tin NTFS"
 
 #: fdisk/i386_sys_types.c:62
 msgid "Linux plaintext"
-msgstr "Văn bản đơn giản Linux"
+msgstr "Linux nhập thô"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba"
@@ -4656,9 +4589,8 @@ msgid "Darwin boot"
 msgstr "Khởi động Darwin"
 
 #: fdisk/i386_sys_types.c:74
-#, fuzzy
 msgid "HFS / HFS+"
-msgstr "OS/2 HPFS"
+msgstr "HFS / HFS+"
 
 #: fdisk/i386_sys_types.c:75
 msgid "BSDI fs"
@@ -4886,28 +4818,18 @@ msgstr ""
 
 #: fdisk/sfdisk.c:610
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr ""
-"%s của phân vùng %s có số đầu đọc không thể có: %lu (phải trong khoảng 0-%"
-"lu)\n"
+msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr "%s của phân vùng %s có số đầu đọc không thể có: %lu (phải trong khoảng 0-%lu)\n"
 
 #: fdisk/sfdisk.c:615
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
-"lu)\n"
-msgstr ""
-"%s của phân vùng %s có số rãnh ghi không thể có: %lu (phải trong khoảng 1-%"
-"lu)\n"
+msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
+msgstr "%s của phân vùng %s có số rãnh ghi không thể có: %lu (phải trong khoảng 1-%lu)\n"
 
 #: fdisk/sfdisk.c:620
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
-"lu)\n"
-msgstr ""
-"%s của phân vùng %s có số trụ không thể có: %lu (phải trong khoảng 1-%lu)\n"
+msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
+msgstr "%s của phân vùng %s có số trụ không thể có: %lu (phải trong khoảng 1-%lu)\n"
 
 #: fdisk/sfdisk.c:660
 #, c-format
@@ -4915,7 +4837,7 @@ msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
-"Tên Id\n"
+"Id  Tên\n"
 "\n"
 
 #: fdisk/sfdisk.c:821
@@ -4924,14 +4846,15 @@ msgid "Re-reading the partition table ...\n"
 msgstr "Đang đọc lại bảng phân vùng ...\n"
 
 #: fdisk/sfdisk.c:827
-#, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
 "before using mkfs\n"
 msgstr ""
-"Lỗi chạy lệnh đọc lại bảng phân vùng\n"
-"Khởi động lại hệ thống ngay bây giờ trước khi sử dụng mkfs\n"
+"Lỗi chạy câu lệnh đọc lại bảng phân vùng.\n"
+"Hãy chạy công cụ partprobe(8) hay kpartx(8),\n"
+"hoặc khởi động lại hệ thống ngay bây giờ,\n"
+"trước khi dùng mkfs.\n"
 
 #: fdisk/sfdisk.c:833
 #, c-format
@@ -5180,10 +5103,8 @@ msgstr "đầu"
 
 #: fdisk/sfdisk.c:1356
 #, c-format
-msgid ""
-"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
-"phân vùng %s: đầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "phân vùng %s: đầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1362
 msgid "end"
@@ -5192,8 +5113,7 @@ msgstr "cuối"
 #: fdisk/sfdisk.c:1365
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
-"phân vùng %s: cuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+msgstr "phân vùng %s: cuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1368
 #, c-format
@@ -5378,19 +5298,15 @@ msgstr "    -l [hay --list]:      liệt kê các phân vùng của mỗi thiế
 
 #: fdisk/sfdisk.c:2310
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr ""
-"    -d [hay --dump]:      cũng như trên nhưng ở dạng có thể dùng cho nhập vào"
+msgstr "    -d [hay --dump]:      cũng như trên nhưng ở dạng có thể dùng cho nhập vào"
 
 #: fdisk/sfdisk.c:2311
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [hay --increment]: số trụ v.v... từ 1 thay vì từ 0"
 
 #: fdisk/sfdisk.c:2312
-msgid ""
-"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
-"MB"
-msgstr ""
-"    -uS, -uB, -uC, -uM:  chấp nhận/báo cáo với đơn vị rãnh ghi/khối/trụ/MB"
+msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
+msgstr "    -uS, -uB, -uC, -uM:  chấp nhận/báo cáo với đơn vị rãnh ghi/khối/trụ/MB"
 
 #: fdisk/sfdisk.c:2313
 msgid "    -T [or --list-types]:list the known partition types"
@@ -5398,9 +5314,7 @@ msgstr "    -T [hay --list-types]:\t\tliệt kê các kiểu phân vùng đã bi
 
 #: fdisk/sfdisk.c:2314
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
-msgstr ""
-"    -D [hay --DOS]:       để tương thích với DOS: lãng phí một chút khoảng "
-"trống"
+msgstr "    -D [hay --DOS]:       để tương thích với DOS: lãng phí một chút khoảng trống"
 
 #: fdisk/sfdisk.c:2315
 msgid "    -R [or --re-read]:   make kernel reread partition table"
@@ -5415,10 +5329,8 @@ msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 không thực sự viết lên đĩa"
 
 #: fdisk/sfdisk.c:2318
-msgid ""
-"    -O file :            save the sectors that will be overwritten to file"
-msgstr ""
-"    -O tập tin :            ghi các rãnh ghi sẽ bị ghi chèn vào tập tin"
+msgid "    -O file :            save the sectors that will be overwritten to file"
+msgstr "    -O tập tin :            ghi các rãnh ghi sẽ bị ghi chèn vào tập tin"
 
 #: fdisk/sfdisk.c:2319
 msgid "    -I file :            restore these sectors again"
@@ -5438,15 +5350,11 @@ msgstr "tùy chọn nguy hiểm:"
 
 #: fdisk/sfdisk.c:2323
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
-msgstr ""
-"    -g [hay --show-geometry]: in ra cấu trúc đĩa theo quan niệm của nhân"
+msgstr "    -g [hay --show-geometry]: in ra cấu trúc đĩa theo quan niệm của nhân"
 
 #: fdisk/sfdisk.c:2324
-msgid ""
-"    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-"table"
-msgstr ""
-"    -G [hay --show-pt-geometry]: in ra cấu trúc dự đoán từ bảng phân vùng"
+msgid "    -G [or --show-pt-geometry]: print geometry guessed from the partition table"
+msgstr "    -G [hay --show-pt-geometry]: in ra cấu trúc dự đoán từ bảng phân vùng"
 
 #: fdisk/sfdisk.c:2325
 msgid ""
@@ -5458,11 +5366,8 @@ msgstr ""
 "                             trong đầu vào"
 
 #: fdisk/sfdisk.c:2327
-msgid ""
-"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
-msgstr ""
-"    -L  [hay --Linux]:     không than phiền về những gì không thích hợp với "
-"Linux"
+msgid "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+msgstr "    -L  [hay --Linux]:     không than phiền về những gì không thích hợp với Linux"
 
 #: fdisk/sfdisk.c:2328
 msgid "    -q  [or --quiet]:      suppress warning messages"
@@ -5504,88 +5409,85 @@ msgstr "%s thiết bị\t\t liệt kê phân vùng kích hoạt trên thiết b
 #: fdisk/sfdisk.c:2342
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr ""
-"%s thiết bị n1 n2 ... kích hoạt phân vùng n1 ..., bỏ kích hoạt phần còn lại\n"
+msgstr "%s thiết bị n1 n2 ... kích hoạt phân vùng n1 ..., bỏ kích hoạt phần còn lại\n"
 
 #: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An thiết bị\t kích hoạt phân vùng n, bỏ kích hoạt những cái khác\n"
 
-#: fdisk/sfdisk.c:2463
+#: fdisk/sfdisk.c:2462
 #, c-format
 msgid ""
 "\n"
-"WARNING: GPT (GUID Partition Table) detected on '%s'! The util sfdisk "
-"doesn't support GPT. Use GNU Parted.\n"
+"WARNING: GPT (GUID Partition Table) detected on '%s'! The util sfdisk doesn't support GPT. Use GNU Parted.\n"
 "\n"
 msgstr ""
 "\n"
-"CẢNH BÁO : phát hiện GPT (bảng phân vùng GUID) trên « %s ». Tiện ích sfdisk "
-"không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
+"CẢNH BÁO : phát hiện GPT (bảng phân vùng GUID) trên « %s ». Tiện ích sfdisk không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2466
+#: fdisk/sfdisk.c:2465
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Sử dụng cờ « --force » (bắt buộc) để bãi bỏ sự kiểm tra này.\n"
 
-#: fdisk/sfdisk.c:2505
+#: fdisk/sfdisk.c:2504
 msgid "no command?\n"
 msgstr "không lệnh?\n"
 
-#: fdisk/sfdisk.c:2637
+#: fdisk/sfdisk.c:2636
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "tổng sô: %llu khối\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2679
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "sử dụng: sfdisk --print-id thiết-bị số-phân-vùng\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2681
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "sử dụng: sfdisk --change-id thiết-bị số-phân-vùng Id\n"
 
-#: fdisk/sfdisk.c:2684
+#: fdisk/sfdisk.c:2683
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "sử dụng: sfdisk --id thiết-bị số-phân-vùng [Id]\n"
 
-#: fdisk/sfdisk.c:2691
+#: fdisk/sfdisk.c:2690
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "chỉ có thể chỉ ra một thiết bị (ngoại trừ với -l hay -s)\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2716
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "không thể mở %s đọc-viết\n"
 
-#: fdisk/sfdisk.c:2719
+#: fdisk/sfdisk.c:2718
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "không mở được %s để đọc\n"
 
-#: fdisk/sfdisk.c:2744
+#: fdisk/sfdisk.c:2743
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2763 fdisk/sfdisk.c:2796
+#: fdisk/sfdisk.c:2762 fdisk/sfdisk.c:2795
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld trụ, %ld đầu đọc, %ld rãnh ghi/trac\n"
 
-#: fdisk/sfdisk.c:2815
+#: fdisk/sfdisk.c:2814
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Không thể lấy kích cỡ của %s\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2894
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte kích hoạt sai: 0x%x thay cho 0x80\n"
 
-#: fdisk/sfdisk.c:2913 fdisk/sfdisk.c:2968 fdisk/sfdisk.c:3001
+#: fdisk/sfdisk.c:2912 fdisk/sfdisk.c:2967 fdisk/sfdisk.c:3000
 msgid ""
 "Done\n"
 "\n"
@@ -5593,7 +5495,7 @@ msgstr ""
 "Hoàn thành\n"
 "\n"
 
-#: fdisk/sfdisk.c:2922
+#: fdisk/sfdisk.c:2921
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5602,35 +5504,35 @@ msgstr ""
 "Bạn có %d phân vùng chính kích hoạt. Đây không phải là vấn đề cho LILO,\n"
 "nhưng MBR của DOS sẽ chỉ khởi động đĩa có 1 phân vùng kích hoạt.\n"
 
-#: fdisk/sfdisk.c:2938
+#: fdisk/sfdisk.c:2937
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "phân vùng %s có id %x và không phải là ẩn\n"
 
-#: fdisk/sfdisk.c:2997
+#: fdisk/sfdisk.c:2996
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id xấu %lx\n"
 
-#: fdisk/sfdisk.c:3014
+#: fdisk/sfdisk.c:3013
 msgid "This disk is currently in use.\n"
 msgstr "Đĩa này hiện đang được sử dụng.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3032
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Lỗi nặng: không thể tìm %s\n"
 
-#: fdisk/sfdisk.c:3036
+#: fdisk/sfdisk.c:3035
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Cảnh báo: %s không phải là thiết bị khối\n"
 
-#: fdisk/sfdisk.c:3042
+#: fdisk/sfdisk.c:3041
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Đang kiểm tra xem có ai đó đang sử dụng đĩa này không...\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3043
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5639,34 +5541,33 @@ msgid ""
 msgstr ""
 "\n"
 "Đĩa này hiện thời đang được sử dụng - phân vùng lại không phải là ý muốn\n"
-"tốt. Bỏ gắn tất cả các hệ thống tập tin, và tắt (swapoff) các phân vùng trao "
-"đổi\n"
+"tốt. Bỏ gắn tất cả các hệ thống tập tin, và tắt (swapoff) các phân vùng trao đổi\n"
 "trên đĩa này. Sử dụng « --no-reread » để bỏ kiểm tra này.\n"
 
-#: fdisk/sfdisk.c:3048
+#: fdisk/sfdisk.c:3047
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Sử dụng --force để bãi bỏ mọi kiểm tra.\n"
 
-#: fdisk/sfdisk.c:3052
+#: fdisk/sfdisk.c:3051
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3060
 #, c-format
 msgid "Old situation:\n"
 msgstr "Tình huống cũ:\n"
 
-#: fdisk/sfdisk.c:3065
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Phân vùng %d không tồn tại, không thể thay đổi nó\n"
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3072
 #, c-format
 msgid "New situation:\n"
 msgstr "Tình huống mới:\n"
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3077
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5674,21 +5575,21 @@ msgstr ""
 "Tôi không thích những phân vùng này - không có gì thay đổi.\n"
 "(Nếu bạn thực sự muốn điều này, sử dụng tùy chọn --force.)\n"
 
-#: fdisk/sfdisk.c:3081
+#: fdisk/sfdisk.c:3080
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Tôi không thích điều này - bạn nên trả lời No\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3085
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bạn có hài lòng với điều này? [ynq] "
 
-#: fdisk/sfdisk.c:3088
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Bạn có muốn ghi lên đĩa? [ynq] "
 
-#: fdisk/sfdisk.c:3093
+#: fdisk/sfdisk.c:3092
 #, c-format
 msgid ""
 "\n"
@@ -5697,16 +5598,16 @@ msgstr ""
 "\n"
 "sfdisk: dữ liệu vào kết thúc sớm\n"
 
-#: fdisk/sfdisk.c:3095
+#: fdisk/sfdisk.c:3094
 msgid "Quitting - nothing changed\n"
 msgstr "Đang thoát - không có gì thay đổi\n"
 
-#: fdisk/sfdisk.c:3101
+#: fdisk/sfdisk.c:3100
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Xin hãy trả lời một trng y,n,q\n"
 
-#: fdisk/sfdisk.c:3109
+#: fdisk/sfdisk.c:3108
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5715,7 +5616,7 @@ msgstr ""
 "Viết thành công bảng phân vùng mới\n"
 "\n"
 
-#: fdisk/sfdisk.c:3115
+#: fdisk/sfdisk.c:3114
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5726,14 +5627,14 @@ msgstr ""
 "(Xem fdisk(8).)\n"
 
 #: fsck/fsck.c:327
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: couldn't open %s: %s\n"
-msgstr "%s: không mở được %s: %s\n"
+msgstr "CẢNH BÁO : không mở được %s: %s\n"
 
 #: fsck/fsck.c:337
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
-msgstr ""
+msgstr "CẢNH BÁO : gặp định dạng sai trên dòng %d của %s\n"
 
 #: fsck/fsck.c:353
 msgid ""
@@ -5742,118 +5643,120 @@ msgid ""
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 "\n"
 msgstr ""
+"CẢNH BÁO : /etc/fstab của bạn không chứa trường fsck passno.\n"
+"\tTiến trình này sẽ điều chỉnh tạm thời, nhưng bạn nên sửa chữa\n"
+"\ttập tin /etc/fstab càng sớm càng có thể.\n"
+"\n"
 
 #: fsck/fsck.c:461
-#, fuzzy, c-format
+#, c-format
 msgid "fsck: %s: not found\n"
-msgstr "umount: %s: không tìm thấy"
+msgstr "fsck: %s: không tìm thấy\n"
 
 #: fsck/fsck.c:577
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
-msgstr ""
+msgstr "%s: đợi: không có tiến trình con nào nữa ?!?\n"
 
 #: fsck/fsck.c:599
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
-msgstr ""
+msgstr "Cảnh báo... %s cho thiết bị %s đã thoát với tín hiệu %d.\n"
 
 #: fsck/fsck.c:605
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
-msgstr ""
+msgstr "%s: %s: trạng thái là %x, không bao giờ nên xảy ra.\n"
 
 #: fsck/fsck.c:644
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
-msgstr ""
+msgstr "Đã kết thúc với %s (trạng thái thoát %d)\n"
 
 #: fsck/fsck.c:704
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
-msgstr ""
+msgstr "%s: Lỗi %d trong khi thực hiện fsck.%s cho %s\n"
 
 #: fsck/fsck.c:725
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
+"Hoặc tất cả hoặc không có kiểu hệ thống tập tin được gửi cho « -t »\n"
+"phải có tiền tố « no » hay « ! ».\n"
 
 #: fsck/fsck.c:744
-#, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
-msgstr "mount: cần chỉ rõ kiểu hệ thống tập tin"
+msgstr "Không thể phân cấp bộ nhớ cho kiểu hệ thống tập tin\n"
 
 #: fsck/fsck.c:867
 #, c-format
-msgid ""
-"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
-"number\n"
+msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
 msgstr ""
+"%s: đang bỏ qua dòng sai trong tập tin « /etc/fstab »:\n"
+"điểm lắp đóng kết có số thứ tự lần chạy fsck khác số không\n"
 
 #: fsck/fsck.c:894
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
-msgstr ""
+msgstr "fsck: không thể kiểm tra %s: fsck.%s không tìm thấy\n"
 
 #: fsck/fsck.c:950
-#, fuzzy
 msgid "Checking all file systems.\n"
-msgstr "Bắt buộc kiểm tra hệ thống tập tin trên %s.\n"
+msgstr "Đang kiểm tra tất cả các hệ thống tập tin.\n"
 
 #: fsck/fsck.c:1041
 #, c-format
 msgid "--waiting-- (pass %d)\n"
-msgstr ""
+msgstr "--đang đợi-- (lần chạy %d)\n"
 
 #: fsck/fsck.c:1061
-#, fuzzy
-msgid ""
-"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
+msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
-"Sử dụng: mkfs [-V] [-t kiểu_FS] [tùy_chọn_FS] thiết_bị [kích_cỡ]\n"
+"Sử dụng: fsck [-AMNPRTV] [ -C [ fd ] ] [-t kiểu_HTTT] [các_tùy_chọn_HTTT] [HTTT ...]\n"
 "\n"
-"FS: hệ thống tập tin\n"
+"HTTT: hệ thống tập tin\n"
 
 #: fsck/fsck.c:1099
-#, fuzzy, c-format
+#, c-format
 msgid "%s: too many devices\n"
-msgstr "%s: %s không phải là thiết bị lp.\n"
+msgstr "%s: quá nhiều thiết bị\n"
 
 #: fsck/fsck.c:1110
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Không mở được %s: %s\n"
 
 #: fsck/fsck.c:1112
-#, fuzzy, c-format
+#, c-format
 msgid "Is /proc mounted?\n"
-msgstr "%s đã bỏ gắn\n"
+msgstr "/proc được gắn kết không?\n"
 
 #: fsck/fsck.c:1121
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
-msgstr ""
+msgstr "Phải là người chủ (root) để quét tìm hệ thống tập tin tương ứng: %s\n"
 
 #: fsck/fsck.c:1124
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find matching filesystem: %s\n"
-msgstr "Đang bỏ gắn mọi hệ thống tập tin nói đến..."
+msgstr "Không tìm thấy hệ thống tập tin tương ứng: %s\n"
 
 #: fsck/fsck.c:1132 fsck/fsck.c:1218
-#, fuzzy, c-format
+#, c-format
 msgid "%s: too many arguments\n"
-msgstr "%s: đối số không rõ: %s\n"
+msgstr "%s: quá nhiều đối số\n"
 
 #: fsck/fsck.c:1252
-#, fuzzy, c-format
+#, c-format
 msgid "fsck from %s\n"
-msgstr "%s từ %s\n"
+msgstr "fsck từ %s\n"
 
 #: fsck/fsck.c:1264
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
-msgstr "Không thể phân phối bộ đệm cho các inode"
+msgstr "%s: Không thể phân phối bộ nhớ cho fsck_path\n"
 
 #: getopt/getopt.c:229
 msgid "Try `getopt --help' for more information.\n"
@@ -5884,10 +5787,8 @@ msgid "              parameters\n"
 msgstr "              tham số\n"
 
 #: getopt/getopt.c:324
-msgid ""
-"  -a, --alternative            Allow long options starting with single -\n"
-msgstr ""
-"  -a, --alternative            Cho phép tùy chọn dài bắt đầu với một - đơn\n"
+msgid "  -a, --alternative            Allow long options starting with single -\n"
+msgstr "  -a, --alternative            Cho phép tùy chọn dài bắt đầu với một - đơn\n"
 
 #: getopt/getopt.c:325
 msgid "  -h, --help                   This small usage guide\n"
@@ -5898,8 +5799,7 @@ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=tùychọndài   Tùy chọn dài cần nhận ra\n"
 
 #: getopt/getopt.c:327
-msgid ""
-"  -n, --name=progname          The name under which errors are reported\n"
+msgid "  -n, --name=progname          The name under which errors are reported\n"
 msgstr "  -n, --name=tên_chương_trình          Báo cáo lỗi dưới tên này\n"
 
 #: getopt/getopt.c:328
@@ -5971,22 +5871,22 @@ msgstr "%s: %s nguyên tử lỗi sau1000 vòng quay!"
 #: hwclock/cmos.c:273
 #, c-format
 msgid "cmos_read(): write to control address %X failed: %s\n"
-msgstr ""
+msgstr "cmos_read(): lỗi ghi vào địa chỉ điều khiển %X: %s\n"
 
 #: hwclock/cmos.c:276
 #, c-format
 msgid "cmos_read(): read data address %X failed: %s\n"
-msgstr ""
+msgstr "cmos_read(): lỗi đọc địa chỉ dữ liệu %X: %s\n"
 
 #: hwclock/cmos.c:307
 #, c-format
 msgid "cmos_write(): write to control address %X failed: %s\n"
-msgstr ""
+msgstr "cmos_write(): lỗi ghi vào địa chỉ điều khiển %X: %s\n"
 
 #: hwclock/cmos.c:311
 #, c-format
 msgid "cmos_write(): write to data address %X failed: %s\n"
-msgstr ""
+msgstr "cmos_write(): lỗi ghi vào địa chỉ dữ liệu %X: %s\n"
 
 #: hwclock/cmos.c:574
 #, c-format
@@ -6001,8 +5901,7 @@ msgstr "Tôi lấy thông tin quyền hạn không thành công vì đã không
 #: hwclock/cmos.c:584
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
-msgstr ""
-"Không thể dùng %s để lấy truy cập cổng V/R:  gọi iopl(3) không thành công.\n"
+msgstr "Không thể dùng %s để lấy truy cập cổng V/R:  gọi iopl(3) không thành công.\n"
 
 #: hwclock/cmos.c:587
 #, c-format
@@ -6025,8 +5924,7 @@ msgstr "nội bộ"
 #: hwclock/hwclock.c:312
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
-msgstr ""
-"%s: Cảnh báo: không nhận ra dòng thứ ba trong tập tin điều chỉnh thời gian\n"
+msgstr "%s: Cảnh báo: không nhận ra dòng thứ ba trong tập tin điều chỉnh thời gian\n"
 
 #: hwclock/hwclock.c:314
 #, c-format
@@ -6060,7 +5958,7 @@ msgstr "Chờ tiếng tíc tắc của đồng hồ...\n"
 #: hwclock/hwclock.c:357
 #, c-format
 msgid "...synchronization failed\n"
-msgstr ""
+msgstr "...lỗi đồng bộ hoá\n"
 
 #: hwclock/hwclock.c:359
 #, c-format
@@ -6070,15 +5968,12 @@ msgstr "...đã nghe thấy tiếng tíc tắc\n"
 #: hwclock/hwclock.c:413
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr ""
-"Giá trị không đúng trong đồng hồ phần cứng: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr "Giá trị không đúng trong đồng hồ phần cứng: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
 #: hwclock/hwclock.c:421
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr ""
-"Thời gian đồng hồ phần cứng : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld giây kể từ "
-"năm 1969\n"
+msgstr "Thời gian đồng hồ phần cứng : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld giây kể từ năm 1969\n"
 
 #: hwclock/hwclock.c:451
 #, c-format
@@ -6096,22 +5991,18 @@ msgid "Clock not changed - testing only.\n"
 msgstr "Đồng hồ không thay đổi - chỉ thử nghiệm mà thôi.\n"
 
 #: hwclock/hwclock.c:536
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the new time.\n"
 msgstr ""
-"Thời gian trôi qua kể từ khi chỉnh thời gian là %.6f giây.\n"
-"Trì hoãn thêm để đi tới giây đầy đủ tiếp theo.\n"
+"Thời gian trôi qua kể từ thời gian tham chiếu là %.6f giây.\n"
+"Trì hoãn thêm để đi tới thời gian mới.\n"
 
 #: hwclock/hwclock.c:572
 #, c-format
-msgid ""
-"The Hardware Clock registers contain values that are either invalid (e.g. "
-"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
-msgstr ""
-"Đồng hồ Phần cứng chứa các giá trị hoặc không đúng (v.d. ngày thứ 50 của "
-"tháng) hoặc vượt quá phạm vi chúng ta có thể điều khiển (v.d. Năm 2095).\n"
+msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr "Đồng hồ Phần cứng chứa các giá trị hoặc không đúng (v.d. ngày thứ 50 của tháng) hoặc vượt quá phạm vi chúng ta có thể điều khiển (v.d. Năm 2095).\n"
 
 #: hwclock/hwclock.c:582
 #, c-format
@@ -6169,15 +6060,13 @@ msgstr ""
 #: hwclock/hwclock.c:663
 #, c-format
 msgid ""
-"The date command issued by %s returned something other than an integer where "
-"the converted time value was expected.\n"
+"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
-"Câu lệnh date (ngày tháng) đưa ra bởi %s trả lại kết quả không phải là một "
-"số nguyên, trong khi mong đợi giá trị thời gian đã chuyển đổi.\n"
+"Câu lệnh date (ngày tháng) đưa ra bởi %s trả lại kết quả không phải là một số nguyên, trong khi mong đợi giá trị thời gian đã chuyển đổi.\n"
 "Câu lệnh là:\n"
 "  %s\n"
 "Kết quả là:\n"
@@ -6190,12 +6079,8 @@ msgstr "chuỗi ngày tháng %s bằng %ld giây kể từ năm 1969.\n"
 
 #: hwclock/hwclock.c:706
 #, c-format
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot set the "
-"System Time from it.\n"
-msgstr ""
-"Đồng hồ Phần cứng không chứa thời gian thích hợp, vì thế chúng ta không thể "
-"đặt Thời gian của Hệ thống từ đó.\n"
+msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
+msgstr "Đồng hồ Phần cứng không chứa thời gian thích hợp, vì thế chúng ta không thể đặt Thời gian của Hệ thống từ đó.\n"
 
 #: hwclock/hwclock.c:728 hwclock/hwclock.c:804
 #, c-format
@@ -6215,8 +6100,7 @@ msgstr "\ttz.tz_minuteswest = %d\n"
 #: hwclock/hwclock.c:734 hwclock/hwclock.c:811
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
-msgstr ""
-"Không thiết lập đồng hồ hệ thống bở vì đang chạy trong chế độ thử nghiệm.\n"
+msgstr "Không thiết lập đồng hồ hệ thống bở vì đang chạy trong chế độ thử nghiệm.\n"
 
 #: hwclock/hwclock.c:743 hwclock/hwclock.c:820
 #, c-format
@@ -6228,20 +6112,18 @@ msgid "settimeofday() failed"
 msgstr "settimeofday() không thành công"
 
 #: hwclock/hwclock.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Current system time: %ld = %s\n"
-msgstr "đọc thời gian hệ thống"
+msgstr "Thời gian hệ thống hiện thời: %ld = %s\n"
 
 #: hwclock/hwclock.c:805
 #, c-format
 msgid "\tUTC: %s\n"
-msgstr ""
+msgstr "\tUTC: %s\n"
 
 #: hwclock/hwclock.c:852
 #, c-format
-msgid ""
-"Not adjusting drift factor because the Hardware Clock previously contained "
-"garbage.\n"
+msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
 msgstr "Không chỉnh độ lệnh thời gian vì Đồng hồ phần cứng chứa rác.\n"
 
 #: hwclock/hwclock.c:857
@@ -6255,22 +6137,16 @@ msgstr ""
 
 #: hwclock/hwclock.c:863
 #, c-format
-msgid ""
-"Not adjusting drift factor because it has been less than a day since the "
-"last calibration.\n"
-msgstr ""
-"Không chỉnh độ lệnh thời gian vì nó nhỏ hơn một ngày kể từ lần định thời "
-"gian cuối cùng.\n"
+msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
+msgstr "Không chỉnh độ lệnh thời gian vì nó nhỏ hơn một ngày kể từ lần định thời gian cuối cùng.\n"
 
 #: hwclock/hwclock.c:911
 #, c-format
 msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
-"of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"Đồng hồ chạy sai lệch %.1f giây trong số %d giây đã qua, và đi ngược lạiđộ "
-"sai lệch %f giây/ngày.\n"
+"Đồng hồ chạy sai lệch %.1f giây trong số %d giây đã qua, và đi ngược lạiđộ sai lệch %f giây/ngày.\n"
 "Chỉnh lại độ sai lệch %f giây/ngày\n"
 
 #: hwclock/hwclock.c:961
@@ -6299,15 +6175,13 @@ msgstr ""
 
 #: hwclock/hwclock.c:1001
 #, c-format
-msgid ""
-"Could not open file with the clock adjustment parameters in it (%s) for "
-"writing"
-msgstr ""
+msgid "Could not open file with the clock adjustment parameters in it (%s) for writing"
+msgstr "Không thể mở tập tin chứa các tham số điều chỉnh đồng hồ (%s) để ghi"
 
 #: hwclock/hwclock.c:1006 hwclock/hwclock.c:1011
 #, c-format
 msgid "Could not update file with the clock adjustment parameters (%s) in it"
-msgstr ""
+msgstr "Không thể cập nhật tập tin chứa các tham số điều chỉnh đồng hồ (%s)"
 
 #: hwclock/hwclock.c:1017
 #, c-format
@@ -6316,19 +6190,13 @@ msgstr "Không cập nhật các tham số chỉnh sai lệch.\n"
 
 #: hwclock/hwclock.c:1058
 #, c-format
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr ""
-"Đồng hồ Phần cứng không có thời gian thích hợp, vì thế chúng ta không thể "
-"chỉnh.\n"
+msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr "Đồng hồ Phần cứng không có thời gian thích hợp, vì thế chúng ta không thể chỉnh.\n"
 
 #: hwclock/hwclock.c:1066
-#, fuzzy, c-format
-msgid ""
-"Not setting clock because last adjustment time is zero, so history is bad."
-msgstr ""
-"Không chỉnh độ lệnh thời gian vì lần định thời gian cuối cùng bằng 0,\n"
-"vì thế lịch sử xấu, và cần khởi động lại việc định thời gian.\n"
+#, c-format
+msgid "Not setting clock because last adjustment time is zero, so history is bad."
+msgstr "Sẽ không đặt đồng hồ vì thời gian điều chỉnh cuối cùng là số không thì lịch sử sai."
 
 #: hwclock/hwclock.c:1089
 #, c-format
@@ -6351,15 +6219,14 @@ msgid "Unable to set system clock.\n"
 msgstr "Không đặt được đồng hồ hệ thống.\n"
 
 #: hwclock/hwclock.c:1230
-#, fuzzy, c-format
+#, c-format
 msgid "Clock in UTC, not changed.\n"
-msgstr "Trình bao chưa thay đổi.\n"
+msgstr "Đồng hồ theo UTC nên không thay đổi gì.\n"
 
 #: hwclock/hwclock.c:1259
 #, c-format
 msgid ""
-"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
-"machine.\n"
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n"
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
@@ -6379,12 +6246,8 @@ msgstr "Nhân đang giữ giá trị khởi đầu là %lu\n"
 
 #: hwclock/hwclock.c:1273
 #, c-format
-msgid ""
-"To set the epoch value, you must use the 'epoch' option to tell to what "
-"value to set it.\n"
-msgstr ""
-"Để đặt giá trị khởi đầu, bạn cần sử dụng tùy chọn 'epoch' để thông báo giá "
-"trị muốn đặt.\n"
+msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
+msgstr "Để đặt giá trị khởi đầu, bạn cần sử dụng tùy chọn 'epoch' để thông báo giá trị muốn đặt.\n"
 
 #: hwclock/hwclock.c:1276
 #, c-format
@@ -6402,7 +6265,7 @@ msgid "%s from %s\n"
 msgstr "%s từ %s\n"
 
 #: hwclock/hwclock.c:1313
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -6440,47 +6303,51 @@ msgid ""
 "  -D | --debug        debug mode\n"
 "\n"
 msgstr ""
-"hwclock - hỏi giờ và đặt đồng hồ phần cứng (theo RTC)\n"
+"hwclock — hỏi giờ và đặt đồng hồ phần cứng (RTC)\n"
 "\n"
 "Sử dụng: hwclock [hàm] [các tùy chọn...]\n"
 "\n"
 "Hàm:\n"
-"  --help        hiển thị trợ giúp này\n"
-"  --show        đọc thời gian đồng hồ phần cứng rồi in ra kết quả\n"
-"  --set         đặt rtc thành thời gian đưa ra với « --date »\n"
-"  --hctosys     đặt thời gian hệ thống bằng đồng hồ phần cứng\n"
-"  --systohc     đặt đồng hồ phần cứng dùng thời gian hệ thống hiện thời\n"
-"  --adjust      chỉnh rtc để tính độ sai lệch có hệ thống kể từ\n"
-"                lần đặt hay chỉnh đồng hồ cuối cùng\n"
-"  --getepoch    in ra giá trị khởi đầu (trong nhân) của đồng hồ phần cứng\n"
-"  --setepoch    đặt giá trị khởi đầu (trong nhân) của đồng hồ phần cứng\n"
-"                thành giá trị đưa bằng « --epoch »\n"
-"  --version     in ra phiên bản của hwclock tới đầu ra tiêu chuẩn\n"
-"\n"
-"Tùy chọn: \n"
-"  --utc         đồng hồ phần cứng chỉ thời gian UTC (đối với kinh tuyến 0)\n"
-"  --localtime   đồng hồ phần cứng chỉ thời gian địa phương\n"
-"  --rtc=đường_dẫn    tập tin đặc biệt « /dev/... » cần dùng thay cho tập tin "
-"mặc định\n"
-"  --directisa   truy cập trực tiếp mạch nối ISA thay vì %s\n"
-"  --badyear     lờ đi năm RTC bởi vì BIOS bị hỏng\n"
-"  --date        chỉ ra thời gian để đặt cho đồng hồ phần cứng\n"
-"  --epoch=năm\tchỉ ra năm đầu tiên của giá trị thời gian khởi đầu\n"
-"                đồng hồ phần cứng\n"
-"  --noadjfile   không truy cập « /etc/adjtime ». Cũng cần sử dụng\n"
-"                hoặc « --utc » hoặc « --localtime »\n"
-"--adjfile=đường_dẫn\tghi rõ đường dẫn đến tập tin điều chỉnh\n"
-"\t\t\t\t\t(mặc định là « /etc/adjtime »)\n"
+"  -h | --help         hiển thị trợ giúp này\n"
+"  -r | --show         đọc đồng hồ phần cứng và in ra kết quả\n"
+"       --set          đặt rtc thành thời gian đưa ra, dùng « --date »\n"
+"  -s | --hctosys      đặt thời gian hệ thống từ đồng hồ phần cứng\n"
+"  -w | --systohc      đặt đồng hồ phần cứng thành thời gian hệ thống hiện thời\n"
+"       --systz        đặt thời gian hệ thống dựa vào múi giờ hiện thời\n"
+"       --adjust       điều chỉnh rtc để tính đến độ lệch có hệ thống\n"
+"\t\t\t\tkế từ lần cuối cùng đặt hay chỉnh đồng hồ\n"
+"       --getepoch     in ra giá trị thời điểm đồng hồ phần cứng của hạt nhân\n"
+"       --setepoch     đặt giá trị thời điểm đồng hồ phần cứng của hạt nhân\n"
+"\t\t\t\tthành giá trị đưa ra dùng « --epoch »\n"
+"  -v | --version      in ra đầu ra tiêu chuẩn phiên bản của hwclock\n"
+"\n"
+"Tuỳ chọn: \n"
+"  -u | --utc          đồng hồ phần cứng tính theo UTC\n"
+"       --localtime    đồng hồ phần cứng tính theo thời gian cục bộ\n"
+"  -f | --rtc=đường_dẫn     tập tin « /dev/... » đặc biệt cần dùng thay cho mặc định\n"
+"       --directisa    truy cập trực tiếp mạch nối ISA thay cho %s\n"
+"       --badyear      lờ đi năm của rtc vì BIOS bị hỏng\n"
+"       --date         ghi rõ thời gian cần đặt trong đồng hồ phần cứng\n"
+"       --epoch=năm   ghi rõ năm là đầu của giá trị thời điểm đồng hồ phần cứng\n"
+"       --noadjfile    đừng truy cập đến « /etc/adjtime ».\n"
+"\t\t\t\tCần dùng hoặc « --utc » hoặc « --localtime »\n"
+"       --adjfile=đường_dẫn\tghi rõ đường dẫn đến tập tin điều chỉnh\n"
+"\t\t\t\t(mặc định là « /etc/adjtime »)\n"
+"       --test         làm tất cả trừ thực sự cập nhật đồng hồ phần cứng\n"
+"\t\t\t\thoặc cái gì khác\n"
+"  -D | --debug        chế độ gỡ lỗi\n"
+"\n"
 
 #: hwclock/hwclock.c:1348
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "       tell hwclock the type of alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
-"  --jensen, --arc, --srm, --funky-toy\n"
-"                thông báo cho hwclock loại alpha bạn có (xem hwclock(8))\n"
+"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"       báo hwclock biết kiểu alpha bạn có (xem hwclock(8))\n"
+"\n"
 
 #: hwclock/hwclock.c:1435
 #, c-format
@@ -6503,30 +6370,18 @@ msgstr ""
 
 #: hwclock/hwclock.c:1567
 #, c-format
-msgid ""
-"%s: The --utc and --localtime options are mutually exclusive.  You specified "
-"both.\n"
-msgstr ""
-"%s: Các tùy chọn « --utc » và « --localtime » loại trừ lẫn nhau.  Bạn lại đưa "
-"ra cả hai.\n"
+msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
+msgstr "%s: Các tùy chọn « --utc » và « --localtime » loại trừ lẫn nhau.  Bạn lại đưa ra cả hai.\n"
 
 #: hwclock/hwclock.c:1574
 #, c-format
-msgid ""
-"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
-"specified both.\n"
-msgstr ""
-"%s: Các tùy chọn « --adjust » và « --noadjust » loại trừ lẫn nhau.  Bạn lại "
-"đưa ra cả hai.\n"
+msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
+msgstr "%s: Các tùy chọn « --adjust » và « --noadjust » loại trừ lẫn nhau.  Bạn lại đưa ra cả hai.\n"
 
 #: hwclock/hwclock.c:1581
 #, c-format
-msgid ""
-"%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
-"specified both.\n"
-msgstr ""
-"%s: Các tùy chọn « --adjfile » và « --noadjfile » loại trừ lẫn nhau.  Bạn lại "
-"đưa ra cả hai.\n"
+msgid "%s: The --adjfile and --noadjfile options are mutually exclusive.  You specified both.\n"
+msgstr "%s: Các tùy chọn « --adjfile » và « --noadjfile » loại trừ lẫn nhau.  Bạn lại đưa ra cả hai.\n"
 
 #: hwclock/hwclock.c:1590
 #, c-format
@@ -6541,38 +6396,27 @@ msgstr "Không có thời gian set-to nào có thể sử dụng. Không thể 
 #: hwclock/hwclock.c:1621
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr ""
-"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Phần cứng.\n"
+msgstr "Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Phần cứng.\n"
 
 #: hwclock/hwclock.c:1626
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr ""
-"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Hệ thống.\n"
+msgstr "Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Hệ thống.\n"
 
 #: hwclock/hwclock.c:1631
 #, c-format
-msgid ""
-"Sorry, only the superuser can change the Hardware Clock epoch in the "
-"kernel.\n"
-msgstr ""
-"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi khởi đầu củaĐồng hồ "
-"Phần cứng trong nhân.\n"
+msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
+msgstr "Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi khởi đầu củaĐồng hồ Phần cứng trong nhân.\n"
 
 #: hwclock/hwclock.c:1651
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr ""
-"Không thể truy cập tới Đồng hồ Phần cứng qua một phương pháp không rõ.\n"
+msgstr "Không thể truy cập tới Đồng hồ Phần cứng qua một phương pháp không rõ.\n"
 
 #: hwclock/hwclock.c:1655
 #, c-format
-msgid ""
-"Use the --debug option to see the details of our search for an access "
-"method.\n"
-msgstr ""
-"Sử dụng tùy chọn --debug để xem chi tiết về quá trình tìm kiếm phương pháp "
-"truy cập của chúng ta.\n"
+msgid "Use the --debug option to see the details of our search for an access method.\n"
+msgstr "Sử dụng tùy chọn --debug để xem chi tiết về quá trình tìm kiếm phương pháp truy cập của chúng ta.\n"
 
 #: hwclock/kd.c:53
 #, c-format
@@ -6652,9 +6496,7 @@ msgstr "ioctl() tới %s để tắt việc gián đoạn cập nhật không th
 #: hwclock/rtc.c:303
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr ""
-"ioctl() tới %s để bật việc gián đoạn cập nhật không thành công một cách bất "
-"thường"
+msgstr "ioctl() tới %s để bật việc gián đoạn cập nhật không thành công một cách bất thường"
 
 #: hwclock/rtc.c:360
 #, c-format
@@ -6673,14 +6515,8 @@ msgstr "Mở %s không thành công"
 
 #: hwclock/rtc.c:410 hwclock/rtc.c:454
 #, c-format
-msgid ""
-"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
-"device driver via the device special file %s.  This file does not exist on "
-"this system.\n"
-msgstr ""
-"Để điều khiển giá trị khởi đầu (epoch) trong nhân, chúng ta cần truy cập tới "
-"driver thiết bị 'rtc' qua tập tin thiết bị đặc biệt %s.  Tập tin này không "
-"tồn tại trên hệ thống.\n"
+msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
+msgstr "Để điều khiển giá trị khởi đầu (epoch) trong nhân, chúng ta cần truy cập tới driver thiết bị 'rtc' qua tập tin thiết bị đặc biệt %s.  Tập tin này không tồn tại trên hệ thống.\n"
 
 #: hwclock/rtc.c:415 hwclock/rtc.c:459
 #, c-format
@@ -6700,21 +6536,17 @@ msgstr "chúng ta đọc khởi đầu (epoch) %ld từ %s bằng RTC_EPOCH_READ
 #: hwclock/rtc.c:446
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr ""
-"Giá trị khởi đầu (epoch) không được nhỏ hơn 1900.  Bạn đã yêu cầu %ld\n"
+msgstr "Giá trị khởi đầu (epoch) không được nhỏ hơn 1900.  Bạn đã yêu cầu %ld\n"
 
 #: hwclock/rtc.c:464
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
-msgstr ""
-"thiết lập khởi đầu (epoch) thành %ld bằng RTC_EPOCH_SET ioctl tới %s.\n"
+msgstr "thiết lập khởi đầu (epoch) thành %ld bằng RTC_EPOCH_SET ioctl tới %s.\n"
 
 #: hwclock/rtc.c:469
 #, c-format
-msgid ""
-"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr ""
-"Trình điều khiển thiết bị của nhân cho %s không có RTC_EPOCH_SET ioctl.\n"
+msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr "Trình điều khiển thiết bị của nhân cho %s không có RTC_EPOCH_SET ioctl.\n"
 
 #: hwclock/rtc.c:472
 #, c-format
@@ -6724,12 +6556,12 @@ msgstr "ioctl(RTC_EPOCH_SET) tới %s không thành công"
 #: libs/blkid/bin/findfs.c:24
 #, c-format
 msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
+msgstr "Sử dụng: %s LABEL=<nhãn>|UUID=<uuid>\n"
 
 #: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
+#, c-format
 msgid "unable to resolve '%s'"
-msgstr "không mở được %s"
+msgstr "không giải quyết được « %s »"
 
 #: login-utils/agetty.c:361
 #, c-format
@@ -6799,20 +6631,16 @@ msgstr "%s: đọc: %m"
 msgid "%s: input overrun"
 msgstr "%s: thừa dữ liệu vào"
 
-#: login-utils/agetty.c:1207
+#: login-utils/agetty.c:1203
 #, c-format
 msgid ""
-"Usage: %s [-8hiLmUw] [-l login_program] [-t timeout] [-I initstring] [-H "
-"login_host] baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
-"line baud_rate,... [termtype]\n"
+"Usage: %s [-8hiLmUw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"
 msgstr ""
 "Sử dụng:\n"
-"%s [-8hiLmUw] [-l trình_đăng_nhập] [-t thời_hạn] [-I chuỗi_sơ_khởi] [-H "
-"máy_đăng_nhập] tốc_độ_bốt,... dòng [kiểu_thiết_bị_cuối]\n"
+"%s [-8hiLmUw] [-l trình_đăng_nhập] [-t thời_hạn] [-I chuỗi_sơ_khởi] [-H máy_đăng_nhập] tốc_độ_bốt,... dòng [kiểu_thiết_bị_cuối]\n"
 "hoặc\n"
-"[-hiLmw] [-l trình_đăng_nhập] [-t thời_hạn] [-I chuỗi_sơ_khởi] [-H "
-"máy_đăng_nhập] dòng tốc_độ_bốt,... [kiểu_thiết_bị_cuối]\n"
+"[-hiLmw] [-l trình_đăng_nhập] [-t thời_hạn] [-I chuỗi_sơ_khởi] [-H máy_đăng_nhập] dòng tốc_độ_bốt,... [kiểu_thiết_bị_cuối]\n"
 
 #: login-utils/checktty.c:91 login-utils/checktty.c:112
 #, c-format
@@ -6877,8 +6705,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM thất bại nên hủy bỏ : %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:727
+#: mount/lomount.c:730
 msgid "Password: "
 msgstr "Mật khẩu: "
 
@@ -6912,15 +6740,15 @@ msgstr "[ --help ] [ --version ]\n"
 
 #: login-utils/chfn.c:378
 msgid "Office"
-msgstr ""
+msgstr "Văn phòng"
 
 #: login-utils/chfn.c:379
 msgid "Office Phone"
-msgstr ""
+msgstr "Điện thoại văn phòng"
 
 #: login-utils/chfn.c:380
 msgid "Home Phone"
-msgstr ""
+msgstr "Điện thoại ở nhà"
 
 #: login-utils/chfn.c:401 login-utils/chsh.c:321
 #, c-format
@@ -6934,7 +6762,7 @@ msgstr ""
 #: login-utils/chfn.c:434
 #, c-format
 msgid "field is too long.\n"
-msgstr "vùng quá dài.\n"
+msgstr "trường quá dài.\n"
 
 #: login-utils/chfn.c:442
 #, c-format
@@ -6963,19 +6791,13 @@ msgstr "%s: %s chưa được xác thực để thay đổi trình bao của %s\
 
 #: login-utils/chsh.c:164
 #, c-format
-msgid ""
-"%s: Running UID doesn't match UID of user we're altering, shell change "
-"denied\n"
-msgstr ""
-"%s: UID đang hoạt động không tương ứng với UID của người dùng chúng ta đang "
-"nhập, không được phép thay đổi trình bao\n"
+msgid "%s: Running UID doesn't match UID of user we're altering, shell change denied\n"
+msgstr "%s: UID đang hoạt động không tương ứng với UID của người dùng chúng ta đang nhập, không được phép thay đổi trình bao\n"
 
 #: login-utils/chsh.c:170
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr ""
-"%s: Trình bao của bạn không có trong /etc/shells, không cho phép thay đổi "
-"trình bao\n"
+msgstr "%s: Trình bao của bạn không có trong /etc/shells, không cho phép thay đổi trình bao\n"
 
 #: login-utils/chsh.c:177
 #, c-format
@@ -7067,8 +6889,7 @@ msgstr "Không mở được %s để đọc nên thoát."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr ""
-"sử dụng: last [-#] [-f tập_tin] [-t tty] [-h tên_máy] [người_dùng ...]\n"
+msgstr "sử dụng: last [-#] [-f tập_tin] [-t tty] [-h tên_máy] [người_dùng ...]\n"
 
 #: login-utils/last.c:284
 msgid "  still logged in"
@@ -7587,7 +7408,7 @@ msgstr "mở thư mục không thành công\n"
 #: login-utils/simpleinit.c:501
 #, c-format
 msgid "respawning: \"%s\" too fast: quenching entry\n"
-msgstr ""
+msgstr "đang tạo và thực hiện lại « %s » quá nhanh: đang dập tắt mục nhập\n"
 
 #: login-utils/simpleinit.c:509
 msgid "fork failed\n"
@@ -7606,19 +7427,19 @@ msgid "no TERM or cannot stat tty\n"
 msgstr "không có TERM hoặc không thể stat (lấy trạng thái về) tty\n"
 
 #: login-utils/simpleinit.c:938
-#, fuzzy, c-format
+#, c-format
 msgid "error stopping service: \"%s\"\n"
-msgstr "lỗi dừng dịch vụ: \"%s\""
+msgstr "lỗi dừng dịch vụ: « %s »\n"
 
 #: login-utils/simpleinit.c:950
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped service: %s\n"
-msgstr "lỗi dừng dịch vụ: \"%s\""
+msgstr "Dịch vụ bị dừng: %s\n"
 
 #: login-utils/simpleinit.c:1070
-#, fuzzy, c-format
+#, c-format
 msgid "error running programme: \"%s\"\n"
-msgstr "lỗi chạy finalprog (chương trình cuối cùng)\n"
+msgstr "lỗi chạy chương trình: « %s »\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7627,7 +7448,7 @@ msgstr "quá nhiều iov (thay đổi mã trong wall/ttymsg.c)"
 #: login-utils/ttymsg.c:85
 #, c-format
 msgid "excessively long line arg"
-msgstr "arg dài quá mức"
+msgstr "dòng đối số quá dài"
 
 #: login-utils/ttymsg.c:140
 #, c-format
@@ -7833,11 +7654,8 @@ msgstr "logger: không rõ tên quyền ưu tiên: %s.\n"
 
 #: misc-utils/logger.c:285
 #, c-format
-msgid ""
-"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr ""
-"Sử dụng: logger [-is] [-f tập_tin] [-p ưu_tiên] [-t thẻ] [-u ổ_cắm] "
-"[ thông_báo ... ]\n"
+msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr "Sử dụng: logger [-is] [-f tập_tin] [-p ưu_tiên] [-t thẻ] [-u ổ_cắm] [ thông_báo ... ]\n"
 
 #: misc-utils/look.c:351
 #, c-format
@@ -7856,35 +7674,36 @@ msgstr "Nhận %d byte từ %s\n"
 
 #: misc-utils/namei.c:144 misc-utils/namei.c:198 misc-utils/namei.c:220
 #: misc-utils/namei.c:227 misc-utils/namei.c:248
-#, fuzzy
 msgid "out of memory?"
-msgstr "tràn bộ nhớ?\n"
+msgstr "không đủ bộ nhớ ?"
 
 #: misc-utils/namei.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "failed to read symlink: %s"
-msgstr "lỗi đọc tập tin đếm thời gian %s"
+msgstr "lỗi đọc liên kết tượng trưng: %s"
 
 #: misc-utils/namei.c:229
-#, fuzzy, c-format
+#, c-format
 msgid "could not stat '%s'"
 msgstr "không thể lấy trạng thái về « %s »"
 
 #: misc-utils/namei.c:411
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Usage: %s [options] pathname [pathname ...]\n"
-msgstr "sử dụng: namei [-mx] tên_đường_dẫn [tên_đường_dẫn ...]\n"
+msgstr ""
+"\n"
+"Sử dụng: %s [các_tuỳ_chọn] tên_đường_dẫn [tên_đường_dẫn ...]\n"
 
 #: misc-utils/namei.c:412
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 "\n"
-"%d phân vùng:\n"
+"Tuỳ chọn:\n"
 
 #: misc-utils/namei.c:415
 #, c-format
@@ -7897,25 +7716,32 @@ msgid ""
 " -n, --nosymlinks    don't follow symlinks\n"
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
+" -h, --help          hiển thị trợ giúp này\n"
+" -x, --mountpoints   hiển thị các thư mục điểm lắp dùng « D »\n"
+" -m, --modes         hiển thị các bit chế độ của mỗi tập tin\n"
+" -o, --owners        hiển thị tên chủ và nhóm của mỗi tập tin\n"
+" -l, --long          dùng một định dạng liệt kê dài (-m -o -v) \n"
+" -n, --nosymlinks    đừng theo liên kết tượng trưng\n"
+" -v, --vertical      sắp hàng theo chiều dọc các chế độ và chủ\n"
 
 #: misc-utils/namei.c:423
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 "\n"
-"Để tìm thêm thông tin, xem « setarch(8) ».\n"
+"Để tìm thêm thông tin, xem namei(1).\n"
 
 #: misc-utils/namei.c:484
-#, fuzzy, c-format
+#, c-format
 msgid "failed to stat: %s"
-msgstr "không thể lấy trạng thái về %s"
+msgstr "lỗi lấy trạng thái: %s"
 
 #: misc-utils/namei.c:495
 #, c-format
 msgid "%s: exceeded limit of symlinks"
-msgstr ""
+msgstr "%s: vượt quá hạn ngạch số các liên kết tượng trưng"
 
 #: misc-utils/rename.c:38
 #, c-format
@@ -8089,8 +7915,7 @@ msgstr "  [ -repeat [on|off] ]\t\tlặp lại [bật|tắt]\n"
 #: misc-utils/setterm.c:775
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
-msgstr ""
-"  [ -appcursorkeys [on|off] ]\t\tcác phím con trỏ của ứng dụng [bật|tắt]\n"
+msgstr "  [ -appcursorkeys [on|off] ]\t\tcác phím con trỏ của ứng dụng [bật|tắt]\n"
 
 #: misc-utils/setterm.c:776
 #, c-format
@@ -8413,7 +8238,7 @@ msgstr "không khóa được tập tin khóa (lock file) %s: %s"
 
 #: mount/fstab.c:661
 msgid "timed out"
-msgstr "hết thời gian"
+msgstr "quá hạn"
 
 #: mount/fstab.c:668
 #, c-format
@@ -8449,115 +8274,112 @@ msgstr "lỗi thay đổi chủ sở hữu của %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "không đổi tên được %s thành %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", bù %<PRIu64>"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:367
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", hạn_cỡ %<PRIu64>"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:375
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", mã_hoá %s (kiểu %<PRIu32>)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %d"
 msgstr ", bù %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:391
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", dạng mã hóa %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:399
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: không lấy được thông tin trên thiết bị %s: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:410
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: không mở được thiết bị %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:426 mount/lomount.c:458 mount/lomount.c:523
+#: mount/lomount.c:572
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: thư mục « /dev » không tồn tại."
 
-#: mount/lomount.c:441 mount/lomount.c:589
-#, fuzzy, c-format
+#: mount/lomount.c:437 mount/lomount.c:585
+#, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
-msgstr "%s: không có quyền xem « /dev/loop# »"
+msgstr "%s: không có quyền xem /dev/loop%s<N>"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:588
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: không tìm thấy thiết bị vòng lặp nào còn trống"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:591
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 "%s: Không tìm thấy bất kỳ thiết bị vòng lặp nào. Có thể nhân này không biết\n"
-"       về thiết bị vòng lặp? (Nếu vậy, hãy biên dịch lại hoặc thử `modprobe "
-"loop'.)"
+"       về thiết bị vòng lặp? (Nếu vậy, hãy biên dịch lại hoặc thử `modprobe loop'.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:621
 msgid "Out of memory while reading passphrase"
-msgstr "Tràn bộ nhớ khi đọc cụm từ mật khẩu"
+msgstr "Không đủ bộ nhớ khi đọc cụm từ mật khẩu"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:664
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "cảnh báo : %s đã liên quan đến %s\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:680
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "cảnh báo : %s: được bảo vệ chống ghi nên đặt chỉ-đọc.\n"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:716
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Không khóa được vào bộ nhớ, đang thoát.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:743
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD bị lỗi: %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:800
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): thành công\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:821
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): thành công\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:825
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: không xóa được thiết bị %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:836
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
-"Phiên bản mount này được biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch "
-"lại.\n"
+msgstr "Phiên bản mount này được biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch lại.\n"
 
-#: mount/lomount.c:875
-#, fuzzy, c-format
+#: mount/lomount.c:871
+#, c-format
 msgid ""
 "\n"
 "Usage:\n"
@@ -8565,21 +8387,22 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
-" %1$s -j | --associated <file> [-o <num>]     list all associated with "
-"<file>\n"
+" %1$s -j | --associated <file> [-o <num>]     list all associated with <file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 "\n"
 "Sử dụng:\n"
-" %1$s thiết_bị_vòng_lặp                 cung cấp thông tin\n"
-" %1$s -a | --all                              liệt kê tất cả đang dùng\n"
-" %1$s -d | --detach <thiết_bị_vòng_lặp>    xoá\n"
-" %1$s -f | --find                             tìm cái không dùng\n"
+" %1$s TBVL                             cung cấp thông tin\n"
+" %1$s -a | --all                              liệt kê tất cả được dùng\n"
+" %1$s -d | --detach <TBVL> [<TBVL> ...]     xoá\n"
+" %1$s -f | --find                             tìm các cái không dùng\n"
 " %1$s -j | --associated <tập_tin> [-o <số>]\n"
-"\t\t\t\t\t\t\tliệt kê tất cả liên quan đến tập tin này\n"
-" %1$s [ các_tùy_chọn ] {-f|--find|thiết_bị_vòng_lặp} <tập_tin>  thiết lập\n"
+"\t\t\t\t\tliệt kê tất cả liên quan đến tập tin này\n"
+" %1$s [ các_tùy_chọn ] {-f|--find|TBVL} <tập_tin>  thiết lập\n"
+"\n"
+"TBVL: thiết bị vòng lặp\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:880
 #, c-format
 msgid ""
 "\n"
@@ -8599,30 +8422,29 @@ msgstr ""
 " -e | --encryption <kiểu>\tbật mã hoá dữ liệu với <tên/số> đã ghi rõ\n"
 " -h | --help              \t\ttrợ giúp này\n"
 " -o | --offset <số>      \t\tbắt đầu ở khoảng bù số này trong tập tin\n"
-"      --sizelimit <số>   \tvòng lặp bị hạn chế thành chỉ <số> byte của tập "
-"tin\n"
+"      --sizelimit <số>   \tvòng lặp bị hạn chế thành chỉ <số> byte của tập tin\n"
 " -p | --pass-fd <số>\t\tđọc cụm từ mật khẩu từ bộ mô tả tập tin <số>\n"
 " -r | --read-only         \t\tthiết lập thiết bị vòng lặp chỉ đọc\n"
 "      --show              \t\tin ra tên thiết bị (với « -f <tập_tin> »)\n"
 " -v | --verbose          \t\tchế độ chi tiết\n"
 "\n"
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1010 mount/lomount.c:1048
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Thiết bị vòng lặp là %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1035
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "vòng lặp bị ăn cắp=%s... nên thử lại\n"
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1045
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: thiết bị đang bận"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1062
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch lại.\n"
@@ -8789,11 +8611,8 @@ msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: theo như mtab thì %s đã gắn vào %s\n"
 
 #: mount/mount.c:1358
-msgid ""
-"mount: I could not determine the filesystem type, and none was specified"
-msgstr ""
-"mount: không thể nhận ra kiểu hệ thống tập tin, và người dùng không chỉ ra "
-"kiểu nào"
+msgid "mount: I could not determine the filesystem type, and none was specified"
+msgstr "mount: không thể nhận ra kiểu hệ thống tập tin, và người dùng không chỉ ra kiểu nào"
 
 #: mount/mount.c:1361
 msgid "mount: you must specify the filesystem type"
@@ -8935,15 +8754,12 @@ msgstr "mount: có thể muốn đặt 'vfat'?"
 #: mount/mount.c:1493
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr ""
-"mount: %s có số hiệu thiết bị sai hoặc chưa hỗ trợ kiểu hệ thống tập tin %s"
+msgstr "mount: %s có số hiệu thiết bị sai hoặc chưa hỗ trợ kiểu hệ thống tập tin %s"
 
 #: mount/mount.c:1501
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr ""
-"mount: %s không phải là một thiết bị khối, và stat (lấy trạng thái) không "
-"thành công?"
+msgstr "mount: %s không phải là một thiết bị khối, và stat (lấy trạng thái) không thành công?"
 
 #: mount/mount.c:1503
 #, c-format
@@ -9017,16 +8833,12 @@ msgstr ""
 #: mount/mount.c:1651
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
-msgstr ""
-"mount: không đưa ra kiểu hệ thống tập tin nên coi như nfs vì có dấu hai "
-"chấm\n"
+msgstr "mount: không đưa ra kiểu hệ thống tập tin nên coi như nfs vì có dấu hai chấm\n"
 
 #: mount/mount.c:1657
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
-msgstr ""
-"mount: không đưa ra kiểu hệ thống tập tin nên giả sử smbfs vì có // đằng "
-"trước\n"
+msgstr "mount: không đưa ra kiểu hệ thống tập tin nên giả sử smbfs vì có // đằng trước\n"
 
 #: mount/mount.c:1752
 #, c-format
@@ -9169,7 +8981,7 @@ msgstr ""
 "\n"
 
 #: mount/swapon.c:92
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Usage:\n"
@@ -9182,11 +8994,11 @@ msgid ""
 msgstr ""
 "\n"
 "Sử dụng:\n"
-" %1$s -a [-e] [-v]                  \t\tbật mọi trao đổi từ « /etc/fstab »\n"
-" %1$s [-p ưu_tiên] [-v] <đặc_biệt>  \tbật trao đổi đã cho\n"
-" %1$s -s                            \t\t\thiển thị bản tóm tắt %1$s -"
-"h                            \t\t\thiển thị trợ giúp\n"
-" %1$s -V                           \t\t\thiển thị phiên bản\n"
+" %1$s -a [-e] [-v] [-f]         bật tất cả các vùng trao đổi từ /etc/fstab\n"
+" %1$s [-p ưu_tiên] [-v] [-f] <đặc_biệt>  bật vùng trao đổi đưa ra\n"
+" %1$s -s                            hiển thị lược sử về cách sử dụng vùng trao đổi\n"
+" %1$s -h                            hiển thị trợ giúp\n"
+" %1$s -V                            hiển thị phiên bản\n"
 "\n"
 
 #: mount/swapon.c:106
@@ -9209,96 +9021,92 @@ msgstr ""
 "\n"
 
 #: mount/swapon.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unexpected file format"
-msgstr "%s: %s: định dạng tập tin bất thường\n"
+msgstr "%s: gặp định dạng tập tin bất thường"
 
 #: mount/swapon.c:177 mount/swapon.c:245 mount/swapon.c:390 mount/swapon.c:549
 #: mount/swapon.c:751
-#, fuzzy, c-format
+#, c-format
 msgid "%s: open failed"
-msgstr "openpty không thành công\n"
+msgstr "%s: lỗi mở"
 
 #: mount/swapon.c:198
-#, fuzzy, c-format
+#, c-format
 msgid "%s: reinitializing the swap."
-msgstr "%s: %s: phát hiện dữ liệu ngưng phần mềm. Đang sơ khởi lại trao đổi.\n"
+msgstr "%s: đang sơ khởi lại vùng trao đổi."
 
 #: mount/swapon.c:202
-#, fuzzy
 msgid "fork failed"
-msgstr "phân nhánh không thành công\n"
+msgstr "lỗi phân nhánh"
 
 #: mount/swapon.c:218
-#, fuzzy
 msgid "execv failed"
-msgstr "thực hiện (exec) không thành công\n"
+msgstr "execv bị lỗi"
 
 #: mount/swapon.c:226
-#, fuzzy
 msgid "waitpid failed"
-msgstr "setuid() bị lỗi"
+msgstr "waitpid bị lỗi"
 
 #: mount/swapon.c:250
-#, fuzzy, c-format
+#, c-format
 msgid "%s: lseek failed"
-msgstr "tìm nơi bị lỗi"
+msgstr "%s: lseek bị lỗi"
 
 #: mount/swapon.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "%s: write signature failed"
-msgstr "lỗi ghi vào đầu ra tiêu chuẩn"
+msgstr "%s: lỗi ghi chữ ký"
 
 #: mount/swapon.c:343
 #, c-format
 msgid "%s: found %sswap v%d signature string for %d KiB PAGE_SIZE\n"
-msgstr ""
+msgstr "%s: tìm thấy chuỗi chữ ký vùng trao đổi %s v%d cho %d KiB KÍCH_CỠ_TRANG\n"
 
 #: mount/swapon.c:363
-#, fuzzy, c-format
+#, c-format
 msgid "%s: stat failed"
-msgstr "%s bị lỗi.\n"
+msgstr "%s: lỗi lấy trạng thái"
 
 #: mount/swapon.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
-msgstr "%s: cảnh báo: %s có quyền không bảo mật %04o, đề nghị dùng %04o\n"
+msgstr "%s: có quyền không bảo mật %04o, đề nghị dùng %04o."
 
 #: mount/swapon.c:381
-#, fuzzy, c-format
+#, c-format
 msgid "%s: skipping - it appears to have holes."
-msgstr "%s: Bỏ qua tập tin %s - nó có vẻ có lỗ hổng.\n"
+msgstr "%s: đang bỏ qua — có vẻ là nó bị lỗ."
 
 #: mount/swapon.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "%s: get size failed"
-msgstr "tìm nơi bị lỗi"
+msgstr "%s: lỗi lấy kích cỡ"
 
 #: mount/swapon.c:401
 #, c-format
 msgid "%s: read swap header failed"
-msgstr ""
+msgstr "%s: lỗi đọc phần đầu vùng trao đổi"
 
 #: mount/swapon.c:414
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
-msgstr ""
+msgstr "%s: last_page 0x%08llx lớn hơn kích cỡ thật của vùng trao đổi"
 
 #: mount/swapon.c:419
 #, c-format
 msgid "%s: swap format pagesize does not match."
-msgstr ""
+msgstr "%s: kích cỡ trang định dạng trao đổi không tương ứng."
 
 #: mount/swapon.c:424
 #, c-format
-msgid ""
-"%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
-msgstr ""
+msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
+msgstr "%s: kích cỡ trang định dạng trao đổi không tương ứng. (Dùng --fixpgsz để sơ khởi lại nó.)"
 
 #: mount/swapon.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
-msgstr "%s: %s: phát hiện dữ liệu ngưng phần mềm. Đang sơ khởi lại trao đổi.\n"
+msgstr "%s: phát hiện dữ liệu ngưng phần mềm. Đang ghi lại chữ ký trao đổi."
 
 #: mount/swapon.c:457 mount/swapon.c:507
 #, c-format
@@ -9306,24 +9114,23 @@ msgid "%s on %s\n"
 msgstr "%s trên %s\n"
 
 #: mount/swapon.c:479
-#, fuzzy, c-format
+#, c-format
 msgid "%s: swapon failed"
-msgstr "%s bị lỗi.\n"
+msgstr "%s swapon bị lỗi"
 
 #: mount/swapon.c:486
-#, fuzzy, c-format
+#, c-format
 msgid "cannot find the device for %s"
-msgstr "%s: không tìm thấy thiết bị cho %s\n"
+msgstr "không tìm thấy thiết bị cho %s"
 
 #: mount/swapon.c:519
-#, fuzzy
 msgid "Not superuser."
-msgstr "Không phải siêu người dùng.\n"
+msgstr "Không phải siêu người dùng.s"
 
 #: mount/swapon.c:522
-#, fuzzy, c-format
+#, c-format
 msgid "%s: swapoff failed"
-msgstr "%s bị lỗi.\n"
+msgstr "%s swapoff bị lỗi"
 
 #: mount/umount.c:40
 #, c-format
@@ -9438,12 +9245,12 @@ msgstr "Đang thử bỏ gắn %s\n"
 
 #: mount/umount.c:465
 msgid "umount: confused when analyzing mtab"
-msgstr ""
+msgstr "umount: bị lẫn lộn khi phân tích mtab"
 
 #: mount/umount.c:470
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
-msgstr ""
+msgstr "umount: không thể tháo gắn kết %s — %s được gắn kết ở trên nó ở cùng một điểm."
 
 #: mount/umount.c:477
 #, c-format
@@ -9458,7 +9265,7 @@ msgstr "umount: %s chưa gắn (theo mtab)"
 #: mount/umount.c:508
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount: có vẻ %s được gắn nhiều lần"
+msgstr "umount: có vẻ là %s được gắn nhiều lần"
 
 #: mount/umount.c:521
 #, c-format
@@ -9507,76 +9314,95 @@ msgid ""
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
+"\n"
+"chrt — thao tác các thuộc tính thời gian thật của một tiến trình.\n"
+"\n"
+"Đặt chính sách:\n"
+"  chrt [các_tùy_chọn] <chính_sách> <ưu_tiên> {<pid> | <lệnh> [<đối_số> ...]}\n"
+"\n"
+"Lấy chính sách:\n"
+"  chrt [các_tùy_chọn] {<pid> | <lệnh> [<đối_số> ...]}\n"
+"\n"
+"\n"
+"Chính sách định thời:\n"
+"  -b | --batch         đặt chính sách thành SCHED_BATCH\n"
+"  -f | --fifo          đặt chính sách thành SCHED_FIFO\n"
+"  -i | --idle          đặt chính sách thành SCHED_IDLE\n"
+"  -o | --other         đặt chính sách thành SCHED_OTHER\n"
+"  -r | --rr            đặt chính sách thành SCHED_RR (mặc định)\n"
+"\n"
+"Tuỳ chọn:\n"
+"  -h | --help          hiển thị trợ giúp này\n"
+"  -p | --pid           thao tác trên mã số tiến trình (PID) đã đưa ra\n"
+"  -m | --max           hiển thị mức ưu tiên hợp lệ tối đa và tối thiểu\n"
+"  -v | --verbose       hiển thị thông tin trạng thái\n"
+"  -V | --version       xuất thông tin phiên bản\n"
+"\n"
 
 #: schedutils/chrt.c:88
-#, fuzzy, c-format
+#, c-format
 msgid "failed to get pid %d's policy"
-msgstr "Lỗi đặt cá tính thành %s"
+msgstr "lỗi lấy chính sách của PID %d"
 
 #: schedutils/chrt.c:90
 #, c-format
 msgid "pid %d's %s scheduling policy: "
-msgstr ""
+msgstr "chính sách định thời %2$s của PID %1$d: "
 
 #: schedutils/chrt.c:108
-#, fuzzy, c-format
+#, c-format
 msgid "unknown\n"
-msgstr "không rõ"
+msgstr "không rõ\n"
 
 #: schedutils/chrt.c:112
 #, c-format
 msgid "failed to get pid %d's attributes"
-msgstr ""
+msgstr "lỗi lấy các thuộc tính về PID %d"
 
 #: schedutils/chrt.c:114
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
-msgstr ""
+msgstr "mức ưu tiên định thời %2$s của PID %1$d: %3$d\n"
 
 #: schedutils/chrt.c:130
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
-msgstr ""
+msgstr "SCHED_%s ưu tiên tiểu/đa\t: %d/%d\n"
 
 #: schedutils/chrt.c:133
 #, c-format
 msgid "SCHED_%s not supported?\n"
-msgstr ""
+msgstr "SCHED_%s không được hỗ trợ ?\n"
 
 #: schedutils/chrt.c:185
-#, fuzzy
 msgid "failed to parse pid"
-msgstr "%s: không mở được: %s\n"
+msgstr "lỗi phân tích PID"
 
 #: schedutils/chrt.c:207
-#, fuzzy
 msgid "current"
-msgstr "ncount"
+msgstr "hiện thời"
 
 #: schedutils/chrt.c:215
-#, fuzzy
 msgid "failed to parse priority"
-msgstr "Lỗi đặt cá tính thành %s"
+msgstr "lỗi phân tích mức ưu tiên"
 
 #: schedutils/chrt.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "failed to set pid %d's policy"
-msgstr "Lỗi đặt cá tính thành %s"
+msgstr "lỗi đặt chính sách của PID %d"
 
 #: schedutils/chrt.c:230
-#, fuzzy, c-format
+#, c-format
 msgid "failed to execute %s"
-msgstr "lỗi đọc tập tin bản đánh máy %s"
+msgstr "lỗi thực hiện %s"
 
 #: schedutils/ionice.c:57
-#, fuzzy
 msgid "ioprio_get failed"
-msgstr "openpty không thành công\n"
+msgstr "ioprio_get bị lỗi"
 
 #: schedutils/ionice.c:75
-#, fuzzy
 msgid "ioprio_set failed"
-msgstr "openpty không thành công\n"
+msgstr "ioprio_set bị lỗi"
 
 #: schedutils/ionice.c:81
 #, c-format
@@ -9596,25 +9422,40 @@ msgid ""
 "  -h                  this help\n"
 "\n"
 msgstr ""
+"\n"
+"ionice — đặt hay lấy hạng và mức ưu tiên định thời V/R của tiến trình.\n"
+"\n"
+"Sử dụng:\n"
+"  ionice [ các_tùy_chọn ] -p <pid> [<pid> ...]\n"
+"  ionoce [ các_tùy_chọn ] <lệnh> [<đối_số> ...]\n"
+"\n"
+"Tuỳ chọn:\n"
+"  -n <dữ_liệu_hạng>      dữ liệu hạng (0-7, nhỏ hơn thì mức ưu tiên cao hơn)\n"
+"  -c <hạng>          hạng định thời\n"
+"                      \t\t1\tthời gian thật\n"
+"\t\t\t\t2\tsự cố gắng tốt nhất\n"
+"\t\t\t\t3\tnghỉ\n"
+"  -t                  bỏ qua lỗi\n"
+"  -h                  trợ giúp này\n"
+"\n"
 
 #: schedutils/ionice.c:110 schedutils/ionice.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "cannot parse number '%s'"
-msgstr "không mở được %s"
+msgstr "không thể phân tích số « %s »"
 
 #: schedutils/ionice.c:157
 msgid "ignoring given class data for idle class"
-msgstr ""
+msgstr "đang lờ đi dữ liệu hạng đưa ra cho hạng nghỉ"
 
 #: schedutils/ionice.c:161
 #, c-format
 msgid "bad prio class %d"
-msgstr ""
+msgstr "hạng ưu tiên sai %d"
 
 #: schedutils/ionice.c:185
-#, fuzzy
 msgid "execvp failed"
-msgstr "thực hiện (exec) không thành công\n"
+msgstr "execvp bị lỗi"
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -9638,12 +9479,10 @@ msgstr ""
 #: sys-utils/cytune.c:125
 #, c-format
 msgid ""
-"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
-"in fifo were %d,\n"
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Tập tin %s, Giá trị ngưỡng %lu, và giá trị thời gian chờ %lu, Số ký tự lớn "
-"nhất trong fifo là %d,\n"
+"Tập tin %s, Giá trị ngưỡng %lu, và giá trị thời gian chờ %lu, Số ký tự lớn nhất trong fifo là %d,\n"
 "và tốc độ truyền tải lớn nhất tính theo ký tự/giây là %f\n"
 
 #: sys-utils/cytune.c:189
@@ -9673,12 +9512,8 @@ msgstr "Giá trị thời gian mặc định không đúng: %s\n"
 
 #: sys-utils/cytune.c:238
 #, c-format
-msgid ""
-"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
-"[-g|-G] file [file...]\n"
-msgstr ""
-"Sử dụng: %s [-q [-i khoảngthờigian]] ([-s giátrị]|[-S giátrị]) ([-t giátrị]|"
-"[-T giátrị]) [-g|-G] tậptin [tậptin...]\n"
+msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
+msgstr "Sử dụng: %s [-q [-i khoảngthờigian]] ([-s giátrị]|[-S giátrị]) ([-t giátrị]|[-T giátrị]) [-g|-G] tậptin [tậptin...]\n"
 
 #: sys-utils/cytune.c:250 sys-utils/cytune.c:269 sys-utils/cytune.c:289
 #: sys-utils/cytune.c:339
@@ -9731,11 +9566,8 @@ msgstr "Không CYGETMON được trên %s: %s\n"
 
 #: sys-utils/cytune.c:418
 #, c-format
-msgid ""
-"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr ""
-"%s: %lu ngắt, %lu/%lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu "
-"bây giờ\n"
+msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu ngắt, %lu/%lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu bây giờ\n"
 
 #: sys-utils/cytune.c:424
 #, c-format
@@ -9744,11 +9576,8 @@ msgstr "   %f int/giây; %f rec, %f gửi (kýtự/giây)\n"
 
 #: sys-utils/cytune.c:429
 #, c-format
-msgid ""
-"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr ""
-"%s: %lu ngắt, %lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu bây "
-"giờ\n"
+msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu ngắt, %lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu bây giờ\n"
 
 #: sys-utils/cytune.c:435
 #, c-format
@@ -9776,39 +9605,55 @@ msgid ""
 "  -h  --help       Display this text\n"
 "  -V  --version    Display version\n"
 msgstr ""
+"Sử dụng: %1$s [-sxun][-w #] fd#\n"
+"       %1$s [-sxon][-w #] tập_tin [-c] lệnh...\n"
+"       %1$s [-sxon][-w #] thư_mục [-c] lệnh...\n"
+"\n"
+"  -s  --shared     Lấy một sự khoá dùng chung\n"
+"  -x  --exclusive  Lấy một sự khoá riêng\n"
+"  -u  --unlock     Gỡ bỏ một sự khoá\n"
+"  -n  --nonblock   Thất bại hơn là đợi\n"
+"  -w  --timeout    Đợi một khoảng thời gian\n"
+"  -o  --close       Đóng bộ mô tả tập tin trước khi chạy câu lệnh\n"
+"  -c  --command    Chạy trong trình bao một chuỗi lệnh riêng lẻ\n"
+"  -h  --help       Hiển thị trợ giúp này\n"
+"  -V  --version    Hiển thị phiên bản\n"
 
 #: sys-utils/flock.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s requires exactly one command argument\n"
-msgstr "%s yêu cầu một tham số\n"
+msgstr "%s: %s: yêu cầu chính sách một đối số lệnh\n"
 
 #: sys-utils/flock.c:219
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot open lock file %s: %s\n"
-msgstr "%s: không mở được %s: %s\n"
+msgstr "%s: không mở được tập tin sự khoá %s: %s\n"
 
 #: sys-utils/flock.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad number: %s\n"
-msgstr "%s: giá trị xấu\n"
+msgstr "%s: số sai: %s\n"
 
 #: sys-utils/flock.c:238
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
-msgstr ""
+msgstr "%s: yêu cầu bộ mô tả tập tin, tập tin hay thư mục\n"
 
 #: sys-utils/flock.c:294
-#, fuzzy, c-format
+#, c-format
 msgid "%s: fork failed: %s\n"
-msgstr "phân nhánh không thành công\n"
+msgstr "%s: lỗi phân nhánh: %s\n"
 
 #: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Usage: %s [options]\n"
 "\n"
-msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
+msgstr ""
+"\n"
+"Sử dụng: %s [các_tùy_chọn]\n"
+"\n"
 
 #: sys-utils/ipcmk.c:86
 #, c-format
@@ -9818,50 +9663,47 @@ msgid ""
 "  -Q            create message queue\n"
 "  -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
+"  -M <kích_cỡ>     tạo đoạn nhớ dùng chung có kích cỡ này\n"
+"  -S <số>    tạo mảng cờ hiệu có số mục này\n"
+"  -Q            tạo hàng đợi thông điệp\n"
+"  -p <chế_độ>     quyền hạn của tài nguyên (mặc định 0644)\n"
 
 #: sys-utils/ipcmk.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
 "\n"
 msgstr ""
 "\n"
-"Để tìm thêm thông tin, xem « setarch(8) ».\n"
+"Để tìm thêm thông tin, xem ipcmk(1).\n"
 
 #: sys-utils/ipcmk.c:142
 msgid "create share memory failed"
-msgstr ""
+msgstr "lỗi tạo vùng nhớ dùng chung"
 
 #: sys-utils/ipcmk.c:144
-#, fuzzy, c-format
+#, c-format
 msgid "Shared memory id: %d\n"
-msgstr ""
-"\n"
-"shmid của một đoạn bộ nhớ chia sẻ =%d\n"
+msgstr "Mã số vùng nhớ dùng chung: %d\n"
 
 #: sys-utils/ipcmk.c:150
 msgid "create message queue failed"
-msgstr ""
+msgstr "lỗi tạo hàng đợi thông điệp"
 
 #: sys-utils/ipcmk.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "Message queue id: %d\n"
-msgstr ""
-"\n"
-"msqid của hàng đợi tin nhắn=%d\n"
+msgstr "Mã số hàng đợi thông điệp: %d\n"
 
 #: sys-utils/ipcmk.c:158
-#, fuzzy
 msgid "create semaphore failed"
-msgstr "đèn tín hiệu đã phân phối = %d\n"
+msgstr "lỗi tạo cờ hiệu"
 
 #: sys-utils/ipcmk.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "Semaphore id: %d\n"
-msgstr ""
-"\n"
-"semid của dãy đèn tín hiệu=%d\n"
+msgstr "Mã số cờ hiệu: %d\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
@@ -9966,11 +9808,8 @@ msgstr "\t%s -h để xem trợ giúp.\n"
 
 #: sys-utils/ipcs.c:128
 #, c-format
-msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
-msgstr ""
-"%s cung cấp thông tin về phương tiện ipc cho những gì người dùng có truy cập "
-"đọc.\n"
+msgid "%s provides information on ipc facilities for which you have read access.\n"
+msgstr "%s cung cấp thông tin về phương tiện ipc cho những gì người dùng có truy cập đọc.\n"
 
 #: sys-utils/ipcs.c:130
 #, c-format
@@ -10240,7 +10079,7 @@ msgstr "------ Người tạo/Chủ sở hữu dãy đèn hiệu --------\n"
 
 #: sys-utils/ipcs.c:412 sys-utils/ipcs.c:418 sys-utils/ipcs.c:427
 msgid "semid"
-msgstr "semid"
+msgstr "mã số cờ hiệu"
 
 #: sys-utils/ipcs.c:416
 #, c-format
@@ -10258,11 +10097,11 @@ msgstr "thay đổi cuối cùng"
 #: sys-utils/ipcs.c:425
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
-msgstr "------ Dãy đèn tín hiệu --------\n"
+msgstr "------ Dãy cờ hiệu --------\n"
 
 #: sys-utils/ipcs.c:427
 msgid "nsems"
-msgstr "nsems"
+msgstr "số đoạn"
 
 #: sys-utils/ipcs.c:486
 #, c-format
@@ -10363,9 +10202,8 @@ msgid "messages"
 msgstr "tin nhắn"
 
 #: sys-utils/ipcs.c:593
-#, fuzzy
 msgid "shmctl failed"
-msgstr "fsync bị lỗi"
+msgstr "shmctl bị lỗi"
 
 #: sys-utils/ipcs.c:595
 #, c-format
@@ -10407,9 +10245,8 @@ msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:619
-#, fuzzy
 msgid "msgctl failed"
-msgstr "fsync bị lỗi"
+msgstr "msgctl bị lỗi"
 
 #: sys-utils/ipcs.c:621
 #, c-format
@@ -10441,9 +10278,8 @@ msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:652 sys-utils/ipcs.c:674
-#, fuzzy
 msgid "semctl failed"
-msgstr "tìm nơi bị lỗi"
+msgstr "semctl bị lỗi"
 
 #: sys-utils/ipcs.c:654
 #, c-format
@@ -10452,7 +10288,7 @@ msgid ""
 "Semaphore Array semid=%d\n"
 msgstr ""
 "\n"
-"semid của dãy đèn tín hiệu=%d\n"
+"semid của dãy cờ hiệu=%d\n"
 
 #: sys-utils/ipcs.c:655
 #, c-format
@@ -10564,46 +10400,42 @@ msgid "cannot daemonize"
 msgstr "không thể chạy trong nền"
 
 #: sys-utils/lscpu.c:64
-#, fuzzy
 msgid "none"
-msgstr "Không"
+msgstr "không"
 
 #: sys-utils/lscpu.c:65
 msgid "para"
-msgstr ""
+msgstr "phần"
 
 #: sys-utils/lscpu.c:66
 msgid "full"
-msgstr ""
+msgstr "đầy"
 
 #: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
-#, fuzzy, c-format
+#, c-format
 msgid "error: %s"
-msgstr "Lỗi RE: "
+msgstr "lỗi: %s"
 
 #: sys-utils/lscpu.c:154
-#, fuzzy, c-format
+#, c-format
 msgid "error parse: %s"
-msgstr "lỗi đọc %s\n"
+msgstr "phân tích lỗi: %s"
 
 #: sys-utils/lscpu.c:176
-#, fuzzy
 msgid "error: strdup failed"
-msgstr "lỗi ghi vào đầu ra tiêu chuẩn"
+msgstr "lỗi: strdup không thành công"
 
 #: sys-utils/lscpu.c:259
-#, fuzzy
 msgid "error: uname failed"
-msgstr "lỗi: không phân tích được UUID"
+msgstr "lỗi: uname không thành công"
 
 #: sys-utils/lscpu.c:481
-#, fuzzy
 msgid "error: malloc failed"
-msgstr "malloc không thành công"
+msgstr "lỗi: malloc không thành công"
 
 #: sys-utils/lscpu.c:496
 msgid "error: /sys filesystem is not accessable."
-msgstr ""
+msgstr "lỗi: hệ thống tập tin « /sys » không thể truy cập được"
 
 #: sys-utils/lscpu.c:514
 #, c-format
@@ -10613,65 +10445,69 @@ msgid ""
 "# starting from zero.\n"
 "# CPU,Core,Socket,Node"
 msgstr ""
+"# Theo đây có định dạng có thể phân tích,\n"
+"# mà có thể được gửi cho chương trình khác.\n"
+"# Mỗi mục riêng trong mỗi cột có một mã số duy nhất,\n"
+"# bắt đầu từ số không.\n"
+"# CPU,Lõi,Ổ_cắm,Nút"
 
 #: sys-utils/lscpu.c:580
 msgid "Thread(s) per core:"
-msgstr ""
+msgstr "Mạch mỗi lõi:"
 
 #: sys-utils/lscpu.c:581
 msgid "Core(s) per socket:"
-msgstr ""
+msgstr "Lõi mỗi ổ cắm:"
 
 #: sys-utils/lscpu.c:582
 msgid "CPU socket(s):"
-msgstr ""
+msgstr "Ổ cắm CPU:"
 
 #: sys-utils/lscpu.c:586
 msgid "NUMA node(s):"
-msgstr ""
+msgstr "Nút NUMA:"
 
 #: sys-utils/lscpu.c:588
 msgid "Vendor ID:"
-msgstr ""
+msgstr "Mã số nhà sản xuất:"
 
 #: sys-utils/lscpu.c:590
 msgid "CPU family:"
-msgstr ""
+msgstr "Nhóm CPU:"
 
 #: sys-utils/lscpu.c:592
 msgid "Model:"
-msgstr ""
+msgstr "Mô hình:"
 
 #: sys-utils/lscpu.c:594
 msgid "Stepping:"
-msgstr ""
+msgstr "Làm bước:"
 
 #: sys-utils/lscpu.c:596
 msgid "CPU MHz:"
-msgstr ""
+msgstr "CPU MHz:"
 
 #: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
-#, fuzzy
 msgid "Virtualization:"
-msgstr "Tình huống cũ:\n"
+msgstr "Mô phỏng:"
 
 #: sys-utils/lscpu.c:604
 msgid "Hypervisor vendor:"
-msgstr ""
+msgstr "Nhà sản xuất bộ mô phòng đồng thời:"
 
 #: sys-utils/lscpu.c:605
 msgid "Virtualization type:"
-msgstr ""
+msgstr "Kiểu mô phỏng:"
 
 #: sys-utils/lscpu.c:613
 #, c-format
 msgid "%s cache:"
-msgstr ""
+msgstr "Vùng nhớ tạm %s:"
 
 #: sys-utils/lscpu.c:621
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [option]\n"
-msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
+msgstr "Sử dụng: %s [tùy_chọn]\n"
 
 #: sys-utils/lscpu.c:624
 msgid ""
@@ -10681,22 +10517,24 @@ msgid ""
 "  -p, --parse    print out in parsable instead of printable format.\n"
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
+"Trình bổ trợ thông tin kiến trúc CPU\n"
+"\n"
+"  -h, --help     trợ giúp\n"
+"  -p, --parse    in ra theo định dạng có thể phân tích thay cho định dạng in được\n"
+"  -s, --sysroot  dùng thư mục làm gốc hệ thống mới\n"
 
 #: sys-utils/lscpu.c:673
-#, fuzzy, c-format
+#, c-format
 msgid "error: change working directory to %s."
-msgstr "lỗi thay đổi chế độ của %s: %s\n"
+msgstr "lỗi: chuyển đổi thư mục làm việc sang %s."
 
 #: sys-utils/rdev.c:77
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr "sử dụng: rdev [ -rv ] [ -o BÙ ] [ ẢNH [ GIÁ_TRỊ [ BÙ ] ] ]"
 
 #: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (hoặc rdev /linux, v.v...) hiển thị thiết bị ROOT (gốc) "
-"hiện thời"
+msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr "  rdev /dev/fd0  (hoặc rdev /linux, v.v...) hiển thị thiết bị ROOT (gốc) hiện thời"
 
 #: sys-utils/rdev.c:79
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -10704,9 +10542,7 @@ msgstr "  rdev /dev/fd0 /dev/hda2         đặt ROOT (gốc) thành /dev/hda2"
 
 #: sys-utils/rdev.c:80
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              đặt ROOTFLAGS [các cờ gốc] (trạng thái chỉ "
-"đọc)"
+msgstr "  rdev -R /dev/fd0 1              đặt ROOTFLAGS [các cờ gốc] (trạng thái chỉ đọc)"
 
 #: sys-utils/rdev.c:81
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
@@ -10714,9 +10550,7 @@ msgstr "  rdev -r /dev/fd0 627            đặt kích cỡ RAMDISK (đĩa RAM)"
 
 #: sys-utils/rdev.c:82
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-"  rdev -v /dev/fd0 1              đặt chế độ VIDEOMODE (chế độ ảnh động) "
-"khởi động"
+msgstr "  rdev -v /dev/fd0 1              đặt chế độ VIDEOMODE (chế độ ảnh động) khởi động"
 
 #: sys-utils/rdev.c:83
 msgid "  rdev -o N ...                   use the byte offset N"
@@ -10735,11 +10569,8 @@ msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     giống như rdev -v"
 
 #: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Chú ý: chế độ ảnh động là: -3=Hỏi, -2=Mở rộng, -1=VGA chuẩn, 1=phím1, "
-"2=phím2,..."
+msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr "Chú ý: chế độ ảnh động là: -3=Hỏi, -2=Mở rộng, -1=VGA chuẩn, 1=phím1, 2=phím2,..."
 
 #: sys-utils/rdev.c:88
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
@@ -10793,8 +10624,7 @@ msgstr "readprofile: lỗi ghi %s: %s\n"
 #: sys-utils/readprofile.c:268
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
-msgstr ""
-"Giả sử thứ tự byte đảo lộn. Dùng « -n » để ép buộc theo thứ tự byte sở hữu.\n"
+msgstr "Giả sử thứ tự byte đảo lộn. Dùng « -n » để ép buộc theo thứ tự byte sở hữu.\n"
 
 #: sys-utils/readprofile.c:284
 #, c-format
@@ -10821,7 +10651,7 @@ msgid "total"
 msgstr "tổng"
 
 #: sys-utils/renice.c:53
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Usage:\n"
@@ -10834,12 +10664,17 @@ msgid ""
 msgstr ""
 "\n"
 "Sử dụng:\n"
-" renice ưu_tiên [-p|--pid] pid [... pid]\n"
-" renice ưu_tiên  -g|--pgrp pgrp [... pgrp]\n"
-" renice ưu_tiên  -u|--user người_dùng [... người_dùng]\n"
+" renice [-n] ưu_tiên [-p|--pid] pid  [... pid]\n"
+" renice [-n] ưu_tiên  -g|--pgrp pgrp [... pgrp]\n"
+" renice [-n] ưu_tiên  -u|--user người_dùng [... người_dùng]\n"
 " renice -h | --help\n"
 " renice -v | --version\n"
 "\n"
+"pid\t\tmã số tiến trình\n"
+"pgrp\t\tnhóm chương trình\n"
+"user\t\tngười dùng\n"
+"help\t\ttrợ giúp\n"
+"version\tphiên bản\n"
 
 #: sys-utils/renice.c:89
 #, c-format
@@ -11009,8 +10844,7 @@ msgstr ""
 msgid ""
 " -h, --help               displays this help text\n"
 " -v, --verbose            says what options are being switched on\n"
-" -R, --addr-no-randomize  disables randomization of the virtual address "
-"space\n"
+" -R, --addr-no-randomize  disables randomization of the virtual address space\n"
 " -F, --fdpic-funcptrs     makes function pointers point to descriptors\n"
 " -Z, --mmap-page-zero     turns on MMAP_PAGE_ZERO\n"
 " -L, --addr-compat-layout changes the way virtual memory is allocated\n"
@@ -11019,8 +10853,7 @@ msgid ""
 " -I, --short-inode        turns on SHORT_INODE\n"
 " -S, --whole-seconds      turns on WHOLE_SECONDS\n"
 " -T, --sticky-timeouts    turns on STICKY_TIMEOUTS\n"
-" -3, --3gb                limits the used address space to a maximum of 3 "
-"GB\n"
+" -3, --3gb                limits the used address space to a maximum of 3 GB\n"
 "     --4gb                ignored (for backward compatibility only)\n"
 msgstr ""
 " -h, --help              \t\thiển thị trợ giúp này\n"
@@ -11031,8 +10864,7 @@ msgstr ""
 " -Z, --mmap-page-zero\tbật MMAP_PAGE_ZERO\n"
 " -L, --addr-compat-layout\tthay đổi cách cấp phát bộ nhớ ảo\n"
 " -X, --read-implies-exec  \tbật READ_IMPLIES_EXEC (đọc ngụ ý thực hiện)\n"
-" -B, --32bit              \t\tbật ADDR_LIMIT_32BIT (giới hạn địa chỉ 32-"
-"bit)\n"
+" -B, --32bit              \t\tbật ADDR_LIMIT_32BIT (giới hạn địa chỉ 32-bit)\n"
 " -I, --short-inode        \t\tbật SHORT_INODE (nút thông tin ngắn)\n"
 " -S, --whole-seconds      \tbật WHOLE_SECONDS (nguyên giây)\n"
 " -T, --sticky-timeouts    \tbật STICKY_TIMEOUTS (thời hạn dính)\n"
@@ -11199,11 +11031,8 @@ msgstr "hexdump: giá trị nhảy qua (skip) xấu.\n"
 
 #: text-utils/hexsyntax.c:131
 #, c-format
-msgid ""
-"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr ""
-"hexdump: [-bcCdovx] [-e fmt] [-f tậptin_fmt] [-n chiềudài] [-s nhảyqua] "
-"[tậptin ...]\n"
+msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr "hexdump: [-bcCdovx] [-e fmt] [-f tậptin_fmt] [-n chiềudài] [-s nhảyqua] [tậptin ...]\n"
 
 #: text-utils/more.c:256
 #, c-format
@@ -11288,13 +11117,11 @@ msgstr ""
 #: text-utils/more.c:1294
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in "
-"brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"Có thể thêm một tham số số nguyên vào trước hầu hết các câu lệnh.  Mặc định "
-"đặttrong dấu ngoặc đơn.\n"
+"Có thể thêm một tham số số nguyên vào trước hầu hết các câu lệnh.  Mặc định đặttrong dấu ngoặc đơn.\n"
 "Dấu sao (*) cho biết tham số sẽ thành mặc định mới.\n"
 
 #: text-utils/more.c:1301
@@ -11319,13 +11146,10 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
-"<space>                 Hiện k dòng văn bản tiếp theo [kích cỡ màn hình hiện "
-"thời]\n"
-"z                       Hiển thị k dòng văn bản tiếp theo [kích cỡ màn hình "
-"hiện thời]*\n"
+"<space>                 Hiện k dòng văn bản tiếp theo [kích cỡ màn hình hiện thời]\n"
+"z                       Hiển thị k dòng văn bản tiếp theo [kích cỡ màn hình hiện thời]*\n"
 "<return>                Hiển thị k dòng văn bản tiếp theo [1]*\n"
-"d hoặc ctrl-D             Cuộn k dòng [kích cỡ cuộn hiện thời, ban đầu là 11]"
-"*\n"
+"d hoặc ctrl-D             Cuộn k dòng [kích cỡ cuộn hiện thời, ban đầu là 11]*\n"
 "q hoặc Q hoặc <interrupt>   Thoát khỏi more\n"
 "s                       Bỏ qua k dòng văn bản [1]\n"
 "f                       Bỏ qua k màn hình văn bản [1]\n"
@@ -11333,8 +11157,7 @@ msgstr ""
 "'                       Đi tới nơi trước khi bắt đầu tìm kiếm\n"
 "=                       Hiển thị số thứ tự dòng hiện thời\n"
 "/<biểu thức chính quy>   Tìm kiếm lần xuất hiện thứ k của biểu thức [1]\n"
-"n                       Tìm kiếm lần xuất hiện thứ k của biểu thức cuối cùng "
-"[1]\n"
+"n                       Tìm kiếm lần xuất hiện thứ k của biểu thức cuối cùng [1]\n"
 "!<cmd> hoặc :!<cmd>       Thực hiện <cmd> trong một shell con\n"
 "v                       Chạy /usr/bin/vi tại dòng hiện thời\n"
 "ctrl-L                  Vẽ lại màn hình\n"
@@ -11480,25 +11303,43 @@ msgid ""
 "  n                       go to next file\n"
 "\n"
 "Many commands accept preceding numbers, for example:\n"
-"+1<newline> (next page); -1<newline> (previous page); 1<newline> (first "
-"page).\n"
+"+1<newline> (next page); -1<newline> (previous page); 1<newline> (first page).\n"
 "\n"
 "See pg(1) for more information.\n"
 "-------------------------------------------------------\n"
 msgstr ""
+"Bảo lưu mọi quyền.\n"
+"-------------------------------------------------------\n"
+"  h                       trợ giúp này\n"
+"  q hay Q                  thoát khỏi chương trình\n"
+"  <dòng_mới>               trang kế tiếp\n"
+"  f                       nhảy tới một trang\n"
+"  d hay ^D                 nửa trang kế tiếp\n"
+"  l                       dòng kế tiếp\n"
+"  $                       trang cuối cùng\n"
+"  /biểu thức chính quy/                 quết tới tìm chuỗi này\n"
+"  ?biểu thức chính quy? hay ^biểu thức chính quy^    quét ngược tìm chuỗi này\n"
+"  . hay ^L                 vẽ lại màn hình\n"
+"  w hay z                  đặt kích cỡ trang và đi tới trang kế tiếp\n"
+"  s tên_tập_tin              lưu tập tin hiện thời vào tên tập tin này\n"
+"  !câu_lệnh                thoát vào trình bao\n"
+"  p                       đi về tập tin trước\n"
+"  n                       đi tới tập tin kế tiếp\n"
+"\n"
+"Nhiều câu lệnh cũng chấp nhận số đi trước, v.d.\n"
+"+1<dòng_mới> (trang kế tiếp); -1<dòng_mới> (trang trước); 1<dòng_mới> (trang đầu).\n"
+"\n"
+"Xem pg(1) để tìm thêm thông tin.\n"
+"-------------------------------------------------------\n"
 
 #: text-utils/pg.c:223
-#, fuzzy
 msgid "Out of memory\n"
-msgstr "Tràn bộ nhớ"
+msgstr "Không đủ bộ nhớ\n"
 
 #: text-utils/pg.c:236
 #, c-format
-msgid ""
-"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
-msgstr ""
-"%s: Sử dụng: %s [-số] [-p chuỗi] [-cefnrs] [+dòng] [+/pattern/] "
-"[các_tậptin]\n"
+msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr "%s: Sử dụng: %s [-số] [-p chuỗi] [-cefnrs] [+dòng] [+/pattern/] [các_tậptin]\n"
 
 #: text-utils/pg.c:245
 #, c-format
@@ -11638,71 +11479,4 @@ msgstr "Dòng nhập vào quá dài.\n"
 #: text-utils/ul.c:599
 #, c-format
 msgid "Out of memory when growing buffer.\n"
-msgstr "Tràn bộ nhớ khi tăng vùng đệm.\n"
-
-#~ msgid "%s: error: label only with v1 swap area\n"
-#~ msgstr "%s: lỗi: chỉ ghi nhãn với vùng trao đổi v1\n"
-
-#~ msgid "fatal: first page unreadable"
-#~ msgstr "lỗi nặng: trang đầu tiên là không thể đọc"
-
-#~ msgid ""
-#~ "%s: Device '%s' contains a valid Sun disklabel.\n"
-#~ "This probably means creating v0 swap would destroy your partition table.\n"
-#~ "No swap was created. If you really want to create v0 swap on that "
-#~ "device,\n"
-#~ "use the -f option to force it.\n"
-#~ msgstr ""
-#~ "%s: thiết bị « %s » chứa một nhãn đĩa Sun đúng.\n"
-#~ "Điều này có nghĩa việc tạo vùng trao đổi pb0\n"
-#~ "sẽ hủy diệt bảng phân vùng của bạn.\n"
-#~ "Vậy không tạo ra vùng trao đổi.\n"
-#~ "Nếu bạn thực sự muốn tạo vùng trao đổi pb0\n"
-#~ "trên thiết bị đó, thì hãy dùng tùy chọn « -f » để bắt buộc.\n"
-
-#~ msgid "namei: unable to get current directory - %s\n"
-#~ msgstr "namei: không lấy được thư mục hiện thời - %s\n"
-
-#~ msgid "namei: unable to chdir to %s - %s (%d)\n"
-#~ msgstr "namei: không chdir (chuyển đổi thư mục) được sang %s - %s (%d)\n"
-
-#~ msgid "namei: could not chdir to root!\n"
-#~ msgstr "namei: không thể chdir (chuyển đổi thư mục) sang root (gốc)!\n"
-
-#~ msgid "namei: could not stat root!\n"
-#~ msgstr "namei: không thể lấy được trạng thái (stat) root!\n"
-
-#~ msgid "namei: buf overflow\n"
-#~ msgstr "namei: còn tràn bộ đệm\n"
-
-#~ msgid " ? could not chdir into %s - %s (%d)\n"
-#~ msgstr " ? không thể chdir (chuyển đổi thư mục) sang %s - %s (%d)\n"
-
-#~ msgid " ? problems reading symlink %s - %s (%d)\n"
-#~ msgstr " ? vấn đề đọc liên kết mềm %s - %s (%d)\n"
-
-#~ msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
-#~ msgstr "  *** VƯỢT QUÁ GIỚI HẠN LIÊN KẾT MỀM CỦA UNIX ***\n"
-
-#~ msgid "namei: unknown file type 0%06o on file %s\n"
-#~ msgstr "namei: không rõ loại tập tin 0%06o về tập tin %s\n"
-
-#~ msgid "mount: going to mount %s by %s\n"
-#~ msgstr "mount: chuẩn bị gắn %s theo %s\n"
-
-#~ msgid "mount: no LABEL=, no UUID=, going to mount %s by path\n"
-#~ msgstr ""
-#~ "mount: không có « LABEL= » (nhãn), cũng không có « UUID= » nên sắp gắn %s "
-#~ "theo đường dẫn\n"
-
-#~ msgid "%s: cannot fork: %s\n"
-#~ msgstr "%s: không thể phân nhánh: %s\n"
-
-#~ msgid "%s: waitpid: %s\n"
-#~ msgstr "%s: waitpid: %s\n"
-
-#~ msgid "%s: cannot stat %s: %s\n"
-#~ msgstr "%s: không thể lấy trạng thái (stat) %s: %s\n"
-
-#~ msgid "could not umount %s - trying %s instead\n"
-#~ msgstr "không bỏ gắn được %s - đang thử %s để thay thế\n"
+msgstr "Không đủ bộ nhớ khi tăng vùng đệm.\n"
-- 
cgit v1.2.3


From d2636bf7f427cba335855e414a1ce397e0b4a3bc Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 21:41:00 +0200
Subject: po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 po/POTFILES.in       |   1 +
 po/ca.po             |  72 ++---
 po/cs.po             |  72 ++---
 po/da.po             |  72 ++---
 po/de.po             |  72 ++---
 po/es.po             |  72 ++---
 po/et.po             |  72 ++---
 po/eu.po             |  72 ++---
 po/fi.po             |  72 ++---
 po/fr.po             |  72 ++---
 po/hu.po             |  72 ++---
 po/id.po             |  72 ++---
 po/it.po             |  72 ++---
 po/ja.po             |  72 ++---
 po/nl.po             |  72 ++---
 po/pl.po             |  72 ++---
 po/pt_BR.po          |  72 ++---
 po/ru.po             |  72 ++---
 po/sl.po             |  72 ++---
 po/sv.po             |  72 ++---
 po/tr.po             |  72 ++---
 po/uk.po             |  72 ++---
 po/util-linux-ng.pot |  72 ++---
 po/vi.po             | 867 +++++++++++++++++++++++++++++++++------------------
 po/zh_CN.po          |  72 ++---
 25 files changed, 1400 insertions(+), 1124 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 30172621..2fdad95e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -86,6 +86,7 @@ libs/blkid/src/probers/vfat.c
 libs/blkid/src/probers/via_raid.c
 libs/blkid/src/probers/vxfs.c
 libs/blkid/src/probers/xfs.c
+libs/blkid/src/probers/zfs.c
 libs/blkid/src/read.c
 libs/blkid/src/resolve.c
 libs/blkid/src/save.c
diff --git a/po/ca.po b/po/ca.po
index 02c47ea7..4bf3418f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre3\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2005-09-17 13:40+0200\n"
 "Last-Translator: Josep Puigdemont <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -7879,25 +7879,25 @@ msgstr "%s: no s'ha pogut executar stat al fitxer temporal.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: no s'hapogut llegir el fitxer temporal.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "el valor de l'any no és legal: utilitzeu 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "el valor del mes és il·legal: utilitzeu 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "el valor de l'any no és legal: utilitzeu 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%2$d de %1$s"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "forma d'ús: cal [-13smjyV] [[mes] any]\n"
@@ -9576,52 +9576,52 @@ msgstr "No s'ha pogut escriure la partició a %s\n"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "desconegut"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS sobre TCP no està implementat.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "ncount"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
@@ -10638,7 +10638,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "Error RE:"
@@ -10660,16 +10660,16 @@ msgstr ""
 "\n"
 "S'ha produït un error en tancar el fitxer\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10678,66 +10678,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Antiga situació:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10746,7 +10746,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
diff --git a/po/cs.po b/po/cs.po
index 83619813..752026f6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2009-04-20 13:39+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -7755,25 +7755,25 @@ msgstr "%s: volání stat pro dočasný soubor selhalo.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: dočasný soubor nelze číst.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "chybná hodnota pro den: použijte 1–%d"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "chybná hodnota pro měsíc: použijte 1–12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "chybná hodnota pro rok: použijte 1–9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Použití: cal [-13smjyV] [[[DEN] MĚSÍC] ROK]\n"
@@ -9532,52 +9532,52 @@ msgid "pid %d's %s scheduling policy: "
 msgstr "%2$s plánovací politika procesu %1$d: "
 
 # unknown policy
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, c-format
 msgid "unknown\n"
 msgstr "neznámá\n"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr "nepodařilo se získat vlastnosti procesu %d"
 
 # XXX: Second argument is "new" or "current"
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr "%2$s plánovací priorita procesu %1$d: %3$d\n"
 
 # First argument just completes literal policy name
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr "SCHED_%s min./max. priorita\t: %d/%d\n"
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "SCHED_%s není podporována?\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 msgid "failed to parse pid"
 msgstr "PID se nezdařilo rozebrat"
 
 # current policy/priority
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr "současná"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 msgid "failed to parse priority"
 msgstr "prioritu se nezdařilo rozebrat"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "politiku procesu %d se nepodařilo nastavit"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, c-format
 msgid "failed to execute %s"
 msgstr "spuštění %s selhalo"
@@ -10611,7 +10611,7 @@ msgstr "paravirtualizace"
 msgid "full"
 msgstr "plná"
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, c-format
 msgid "error: %s"
 msgstr "chyba: %s"
@@ -10629,15 +10629,15 @@ msgstr "chyba: funkce strdup selhala"
 msgid "error: uname failed"
 msgstr "chyba: volání uname selhalo"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 msgid "error: malloc failed"
 msgstr "chyba: funkce malloc selhala"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr "chyba: souborový systém /sys není přístupný."
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10650,67 +10650,67 @@ msgstr ""
 "# které se počítá od nuly.\n"
 "# CPU,Jádro,Patice,Uzel"
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr "Vláken na jádro:"
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr "Jader na patici:"
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr "Patic CPU:"
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr "Uzly NUMA:"
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr "ID výrobce:"
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr "Rodina CPU:"
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr "Model:"
 
 # ???: Existuje český překlad?
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr "Stepping:"
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr "CPU MHz:"
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 msgid "Virtualization:"
 msgstr "Virtualizace:"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr "Výrobce hypervizoru:"
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr "Druh virtualizace:"
 
 # ???: keš
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr "%s cache:"
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Použití: %s [PŘEPÍNAČ]\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10725,7 +10725,7 @@ msgstr ""
 "čitelné\n"
 "  -s, --sysroot  použije adresář jako kořen nového systému\n"
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, c-format
 msgid "error: change working directory to %s."
 msgstr "chyba: změna pracovního adresáře do %s."
diff --git a/po/da.po b/po/da.po
index b6c9b815..f9f5a485 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2005-08-15 21:00+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -7715,25 +7715,25 @@ msgstr "%s: kunne ikke finde midlertidig fil.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: kunne ikke l�se midlertidig fil.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "ugyldig �rsv�rdi: brug 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "ugyldig m�nedsv�rdi: brug 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "ugyldig �rsv�rdi: brug 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "brug: cal [-13smjyV] [[m�ned] �r]\n"
@@ -9391,52 +9391,52 @@ msgstr "Mislykket skrivning af partition p
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "ukendt"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS via TCP underst�ttes ikke.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: Kunne ikke �bne: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "nantal"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Mislykket skrivning af partition p� %s\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Mislykket skrivning af partition p� %s\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() kunne ikke afl�se tiden fra %s"
@@ -10442,7 +10442,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "RE fejl: "
@@ -10464,16 +10464,16 @@ msgstr ""
 "\n"
 "Fejl ved lukning af fil\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "hukommelsesallokering mislykkedes (malloc)"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10482,66 +10482,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Gammel situation:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10550,7 +10550,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "fejl ved �ndring af filtilstand for %s: %s\n"
diff --git a/po/de.po b/po/de.po
index e329d6af..dc1d1560 100644
--- a/po/de.po
+++ b/po/de.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2008-01-09 17:38+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -7961,25 +7961,25 @@ msgstr "%s: Konnte „stat“ nicht auf eine temporäre Datei anwenden.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: Konnte eine temporäre Datei nicht lesen.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "illegaler Wert für Jahr: benutzen Sie 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "illegaler Wert für Monat: benutzen Sie 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "illegaler Wert für Jahr: benutzen Sie 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Aufruf: cal [-13smjyV] [[Monat] Jahr]\n"
@@ -9701,52 +9701,52 @@ msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "unbekannter"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS über TCP wird nicht unterstützt.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "ncount"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() konnte Zeit nicht von %s lesen."
@@ -10765,7 +10765,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "Fehler in regulärem Ausdruck: "
@@ -10787,16 +10787,16 @@ msgstr ""
 "\n"
 "Fehler beim Schließen von Datei\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "„malloc“ schlug fehl"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10805,66 +10805,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Alte Aufteilung:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10873,7 +10873,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
diff --git a/po/es.po b/po/es.po
index 299e878e..eaaff06b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.12m\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2004-12-22 01:31+0100\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -7885,25 +7885,25 @@ msgstr "%s: no se puede ejecutar stat para fichero temporal.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: no se puede leer el fichero temporal.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "Valor de a�o no permitido: utilice 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "Valor de mes no permitido: utilice 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "Valor de a�o no permitido: utilice 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s de %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "uso: cal [-13smjyV] [[mes] a�o]\n"
@@ -9587,51 +9587,51 @@ msgstr "Error al escribir la partici
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "desconocido"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS sobre TCP no est� soportado.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: fallo al abrir %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr "actual"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() no ha podido leer la hora de %s"
@@ -10649,7 +10649,7 @@ msgid "full"
 msgstr ""
 
 # �Qu� significa?
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "RE error:"
@@ -10671,16 +10671,16 @@ msgstr ""
 "\n"
 "Error al cerrar el fichero\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "La asignaci�n de memoria (malloc) ha fallado"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10689,66 +10689,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Situaci�n anterior:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10757,7 +10757,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "Error al cambiar el modo de %s: %s\n"
diff --git a/po/et.po b/po/et.po
index bef93384..38617197 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11r\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2002-05-19 20:04GMT+0300\n"
 "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -7656,25 +7656,25 @@ msgstr "%s: ei suuda lugeda ajutise faili staatust\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: ei suuda lugeda ajutist faili\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "Vigane aasta number, lubatud on 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "Vigane kuu number, lubatud on 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "Vigane aasta number, lubatud on 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Kasutamine: cal [-13smjyV] [[kuu] aasta]\n"
@@ -9277,50 +9277,50 @@ msgstr ""
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "tundmatu"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr ""
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 msgid "failed to parse priority"
 msgstr ""
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
@@ -10291,7 +10291,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "positsioneerimise viga"
@@ -10311,16 +10311,16 @@ msgstr "%s avamine ei 
 msgid "error: uname failed"
 msgstr "Viga %s sulgemisel\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "M�lu sai otsa"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10329,65 +10329,65 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 msgid "Virtualization:"
 msgstr ""
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10396,7 +10396,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "Viga sektori %lu kirjutamisel seadmele %s\n"
diff --git a/po/eu.po b/po/eu.po
index 3dd6fc1e..00b52324 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2005-08-15 18:45+0200\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -7202,25 +7202,25 @@ msgstr ""
 msgid "%s: can't read temporary file.\n"
 msgstr ""
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "Baliogabeok buru baloreak"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr ""
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr ""
@@ -8815,49 +8815,49 @@ msgstr ""
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "Ezezaguna"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 msgid "failed to parse pid"
 msgstr ""
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr ""
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 msgid "failed to parse priority"
 msgstr ""
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, c-format
 msgid "failed to execute %s"
 msgstr ""
@@ -9825,7 +9825,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, c-format
 msgid "error: %s"
 msgstr ""
@@ -9843,16 +9843,16 @@ msgstr ""
 msgid "error: uname failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "settimeofday()-ek huts egin du"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -9861,65 +9861,65 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 msgid "Virtualization:"
 msgstr ""
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "erabilera: %s [ -n] gailua\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -9928,7 +9928,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, c-format
 msgid "error: change working directory to %s."
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 31ab4f12..643d7c5d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.14.1-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2009-03-08 14:17+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -7740,25 +7740,25 @@ msgstr "%s: väliaikaistiedoston tilaa ei voi lukea.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "virheellinen päivän arvo: käytä 1-%d"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "virheellinen kuukauden arvo: käytä 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "virheellinen vuoden arvo: käytä 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "käyttö: cal [-13smjyV] [[[päivä] kuukausi] vuosi]\n"
@@ -9455,52 +9455,52 @@ msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "tuntemattomassa "
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS yli TCP:n ei ole tuettu.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "ncount"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() ei onnistunut lukemaan aikaa kohteesta %s"
@@ -10502,7 +10502,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "Virhe säännöllisessä lausekkeessa: "
@@ -10522,16 +10522,16 @@ msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 msgid "error: uname failed"
 msgstr "virhe: UUID:n jäsennys epäonnistui"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "malloc epäonnistui"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10540,66 +10540,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Vanha tilanne:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10608,7 +10608,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
diff --git a/po/fr.po b/po/fr.po
index ecdb1a2a..a4032cc1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2009-04-19 22:13+0100\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -7920,25 +7920,25 @@ msgstr "%s: ne peut 
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: ne peut lire du fichier temporaire.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "valeur de jour incorrecte : utiliser 1-%d"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "valeur de mois ill�gal: utiliser 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "valeur d'ann�e ill�gale: utiliser 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Utilisation : cal [-13smjyV] [[[jour] mois] ann�e]\n"
@@ -9711,49 +9711,49 @@ msgstr "impossible d'obtenir la strat
 msgid "pid %d's %s scheduling policy: "
 msgstr "strat�gie de planification d'ex�cution pour pid %d %s :"
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, c-format
 msgid "unknown\n"
 msgstr "inconnu\n"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr "impossible d'obtenir les attributs pour le pid %d"
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr "priorit� de planification d'ex�cution pour le pid %d %s : %d\n"
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr "SCHED_%s priorit� min/max \t: %d/%d\n"
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "SCHED_%s non support�(e) ?\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 msgid "failed to parse pid"
 msgstr "analyse impossible pour ce pid"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr "actuel"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 msgid "failed to parse priority"
 msgstr "impossible d'analyser la priorit�"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "impossible de fixer la strat�gie d'ex�cution du pid %d"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, c-format
 msgid "failed to execute %s"
 msgstr "impossible d'ex�cuter %s"
@@ -10791,7 +10791,7 @@ msgstr "para"
 msgid "full"
 msgstr "complet"
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, c-format
 msgid "error: %s"
 msgstr "erreur : %s "
@@ -10809,15 +10809,15 @@ msgstr "erreur : 
 msgid "error: uname failed"
 msgstr "erreur : �chec de \"uname\""
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 msgid "error: malloc failed"
 msgstr "erreur : �chec de \"malloc\""
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr "erreur : le syst�me de fichiers /sys est inaccessible."
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10830,65 +10830,65 @@ msgstr ""
 "# un unique num�ro ID partant de z�ro.\n"
 "# CPU, coeur, support (socket), noeud"
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr "Thread(s) par coeur :"
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr "Coeur(s) par support CPU :"
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr "Support(s) CPU :"
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr "Noeud(s) NUMA :"
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr "ID du vendeur :"
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr "Famille CPU :"
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr "Mod�le :"
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr "Version :"
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr "CPU MHz :"
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 msgid "Virtualization:"
 msgstr "Virtualisation :"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr "Vendeur hyperviseur :"
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr "Type de virtualisation :"
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr "%s cache :"
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Utilisation : %s [options]\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10902,7 +10902,7 @@ msgstr ""
 "  -p, --parse    sortie en format analysable et non affichable.\n"
 "  -s, --sysroot  sp�cifie un r�pertoire comme racine du syst�me.\n"
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, c-format
 msgid "error: change working directory to %s."
 msgstr "erreur : changement de r�pertoire de travail en %s."
diff --git a/po/hu.po b/po/hu.po
index 95ae2b78..4c66cd4e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.14-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2008-05-21 18:25+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -7806,25 +7806,25 @@ msgstr "%s: nem érhető el az ideiglenes fájl.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: nem olvasható az ideiglenes fájl.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "érvénytelen napérték: használjon 1-%d közötti értéket"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "érvénytelen hónapérték: használjon 1-12 közötti értéket"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "érvénytelen évérték: használjon 1-9999 közötti értéket"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Használat: cal [-13smjyV] [[[nap] hónap] év]\n"
@@ -9570,52 +9570,52 @@ msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "ismeretlen"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "n.szám"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "a típusparancsfájl (%s) olvasása meghiúsult"
@@ -10635,7 +10635,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "RE hiba: "
@@ -10655,16 +10655,16 @@ msgstr "a szabványos kimenetre írás meghiúsult"
 msgid "error: uname failed"
 msgstr "hiba: az UUID feldolgozás meghiúsult"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "a malloc meghiúsult"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10673,66 +10673,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Régi helyzet:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10741,7 +10741,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "hiba a(z) %s módjának módosításakor: %s\n"
diff --git a/po/id.po b/po/id.po
index 86a6aaed..fa1f70d5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2009-04-20 09:00+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -7800,25 +7800,25 @@ msgstr "%s: tidak dapat memperoleh statistik file sementara.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: tidak dapat membaca file sementara.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "nilai hari ilegal: gunakan 1-%d"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "nilai bulan ilegal: gunakan 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "nilai tahun ilegal: gunakan 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "penggunaan: cal [-13smjyV] [[[hari] bulan] tahun]\n"
@@ -9588,49 +9588,49 @@ msgstr "gagal mendapatkan kebijakan pid %d"
 msgid "pid %d's %s scheduling policy: "
 msgstr "pid %d %s kebijakan antrian: "
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, c-format
 msgid "unknown\n"
 msgstr "tidak diketahui\n"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr "gagal mendapatkan atribut pid %d"
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr "pid %d %s prioritas antrian: %d\n"
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr "SCHED_%s min/max prioritas\t: %d/%d\n"
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "SCHED_%s tidak didukung?\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 msgid "failed to parse pid"
 msgstr "gagal mendapatkan pid"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr "sekarang"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 msgid "failed to parse priority"
 msgstr "gagal mendapatkan prioritas"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "gagal menset kebijakan pid %d"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, c-format
 msgid "failed to execute %s"
 msgstr "gagal menjalankan %s"
@@ -10663,7 +10663,7 @@ msgstr "para"
 msgid "full"
 msgstr "penuh"
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, c-format
 msgid "error: %s"
 msgstr "error: %s"
@@ -10681,15 +10681,15 @@ msgstr "error: strdup gagal"
 msgid "error: uname failed"
 msgstr "error: uname gagal"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 msgid "error: malloc failed"
 msgstr "error: malloc gagal"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr "error: sistem berkas /sys tidak dapat diakses."
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10702,65 +10702,65 @@ msgstr ""
 "# ID unik berawal dari nol.\n"
 "# CPU,Core,Soket,Node"
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr "Thread(s) setiap inti:"
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr "Inti setiap soket:"
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr "CPU soket:"
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr "Titik NUMA:"
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr "ID Pembuat:"
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr "Keluarga CPU:"
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr "Model:"
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr "Stepping:"
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr "CPU MHz:"
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 msgid "Virtualization:"
 msgstr "Virtualisasi:"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr "Pembuat Hypervisor:"
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr "Tipe virtualisasi:"
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr "%s persediaan:"
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Penggunaan: %s [pilihan]\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10775,7 +10775,7 @@ msgstr ""
 "tercetak.\n"
 "  -s, --sysroot   gunakan direktori sebagai sistem root baru.\n"
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, c-format
 msgid "error: change working directory to %s."
 msgstr "error: mengubah direktori kerja ke %s."
diff --git a/po/it.po b/po/it.po
index 7847a780..468739f5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2008-04-18 13:44+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -7775,26 +7775,26 @@ msgstr "%s: impossibile fare stat del file temporaneo.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: impossibile leggere il file temporaneo.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "valore dell'anno non valido: usare 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "valore del mese non valido: usare 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "valore dell'anno non valido: usare 1-9999"
 
 # FIXME
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Uso: cal [-13smjyV] [[mese] anno]\n"
@@ -9427,52 +9427,52 @@ msgstr "Scrittura della partizione su %s non riuscita\n"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "sconosciuto"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS attraverso TCP non supportato.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "ncount"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() non è riuscito a leggere l'orario da %s"
@@ -10483,7 +10483,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "fork: %s"
@@ -10505,16 +10505,16 @@ msgstr ""
 "\n"
 "Errore durante la chiusura del file\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "malloc non riuscita"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10523,66 +10523,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Vecchia situazione:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10591,7 +10591,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "errore durante il cambiamento della modalità di %s: %s\n"
diff --git a/po/ja.po b/po/ja.po
index bb2ee0ca..92dc277a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.14.2-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2009-01-28 16:54+0900\n"
 "Last-Translator: Makoto Kato <makoto.kt@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -7693,25 +7693,25 @@ msgstr "%s: 一時ファイルの情報を取得できません。\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: 一時ファイルを読めません。\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "不正な日: 1-%d を使ってください"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "不正な月: 1-12 を使ってください"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "不正な年: 1-9999 を使ってください"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "使い方: cal [-13smjyV] [[[日] 月] 年]\n"
@@ -9408,51 +9408,51 @@ msgstr "%s のパーティション書き込みに失敗\n"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "不明な"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "TCP 経由の NFS はサポートされていません。\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: open に失敗: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr "現在"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "typescript ファイル %s の読み込みが失敗しました"
@@ -10461,7 +10461,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "RE エラー"
@@ -10481,16 +10481,16 @@ msgstr "標準出力への書き込みが失敗しました"
 msgid "error: uname failed"
 msgstr "エラー: UUID の解析に失敗"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "malloc に失敗"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10499,66 +10499,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "古い場面:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10567,7 +10567,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "%s のモード変更エラー: %s\n"
diff --git a/po/nl.po b/po/nl.po
index d9fd1ff3..0caefc85 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng-2.14.2-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2009-01-31 20:52+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -7790,25 +7790,25 @@ msgstr "%s: kan tijdelijk bestand niet vinden\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: kan tijdelijk bestand niet lezen\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "onjuiste dagwaarde;  gebruik 1-%d"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "onjuiste maandwaarde;  gebruik 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "onjuiste jaarwaarde;  gebruik 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Gebruik:  cal [-13smjyV] [[[dag] maand] jaar]\n"
@@ -9551,52 +9551,52 @@ msgstr "Instellen van systeemeigenschappen voor %s is mislukt"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "onbekende tijd"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: openen is mislukt: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "ncount"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Instellen van systeemeigenschappen voor %s is mislukt"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Instellen van systeemeigenschappen voor %s is mislukt"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "kan scriptbestand %s niet lezen"
@@ -10613,7 +10613,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "Fout in reguliere expressie: "
@@ -10633,16 +10633,16 @@ msgstr "schrijven naar standaarduitvoer is mislukt"
 msgid "error: uname failed"
 msgstr "fout: kan UUID niet ontleden"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "malloc() is mislukt"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10651,66 +10651,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Oude situatie:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Gebruik:  %s [opties] apparaat ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10719,7 +10719,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "fout bij wijzigen van modus van %s: %s\n"
diff --git a/po/pl.po b/po/pl.po
index c86eed5d..7c04f106 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2006-12-22 00:25+0100\n"
 "Last-Translator: Andrzej Krzysztofowicz <ankry@mif.pg.gda.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -7207,25 +7207,25 @@ msgstr ""
 msgid "%s: can't read temporary file.\n"
 msgstr ""
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr ""
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr ""
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr ""
@@ -8816,50 +8816,50 @@ msgstr ""
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, c-format
 msgid "unknown\n"
 msgstr ""
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: nie uda�o si� otworzy�: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr ""
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 msgid "failed to parse priority"
 msgstr ""
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "Nie mo�na odczyta� i-w�z��w"
@@ -9823,7 +9823,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "b��d zamykania %s"
@@ -9841,15 +9841,15 @@ msgstr ""
 msgid "error: uname failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 msgid "error: malloc failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -9858,65 +9858,65 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 msgid "Virtualization:"
 msgstr ""
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "u�ycie: %s [ -n ] urz�dzenie\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -9925,7 +9925,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, c-format
 msgid "error: change working directory to %s."
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b87f6534..2432fe85 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11b\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2001-05-24 16:03-03:00\n"
 "Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -7785,25 +7785,25 @@ msgstr "%s: n
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: n�o foi poss�vel ler arquivo tempor�rio.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "valor de ano inv�lido: use 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "valor de m�s inv�lido: use 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "valor de ano inv�lido: use 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Uso: cal [-mjyV] [[m�s] ano]\n"
@@ -9471,51 +9471,51 @@ msgstr "N
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "desconhecida"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS sobre TCP n�o � suportado.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr "atual"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() n�o conseguiu ler a hora de /dev/tty1"
@@ -10528,7 +10528,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr ", erro"
@@ -10548,16 +10548,16 @@ msgstr "A abertura de %s falhou"
 msgid "error: uname failed"
 msgstr "Erro no fechamento de %s\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "malloc falhou"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10566,66 +10566,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Situa��o antiga:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10634,7 +10634,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "erro ao alterar o modo de %s: %s\n"
diff --git a/po/ru.po b/po/ru.po
index 2e5b64ed..c294e370 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2006-03-07 12:42+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -7809,25 +7809,25 @@ msgstr "%s: 
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: ���������� ��������� ��������� ����.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "����������� �������� ����: ����������� 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "����������� �������� ������: ����������� 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "����������� �������� ����: ����������� 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "�������������: cal [-13smjyV] [[�����] ���]\n"
@@ -9505,52 +9505,52 @@ msgstr "
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "�����������"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS ����� TCP �� ��������������.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "ncount"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "������ ������ ������� �� %s\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "������ ������ ������� �� %s\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() ���������� �������� ��� ������ ������� �� %s"
@@ -10562,7 +10562,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "������ RE: "
@@ -10584,16 +10584,16 @@ msgstr ""
 "\n"
 "������ �������� �����\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "malloc ���������� ��������"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10602,66 +10602,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "������ ��������:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10670,7 +10670,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "������ ����� ������ %s: %s\n"
diff --git a/po/sl.po b/po/sl.po
index 5ffe7d52..0fb32d1f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre6\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2006-03-05 12:29+0200\n"
 "Last-Translator: Simon Mihevc <simonmihevc@email.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -7747,25 +7747,25 @@ msgstr "%s ni mogo
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: ni mogo�e brati iz za�asne datoteke.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "neveljavna vrednost leta: uporabite 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "neveljavna vrednost meseca: uporabite 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "neveljavna vrednost leta: uporabite 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "uporaba: cal [-13smjyV] [[mesec] leto]\n"
@@ -9434,52 +9434,52 @@ msgstr "Neuspe
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "neznanem"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS �ez TCP ni podprt.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "ncount"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "klic ioctl() ni uspel prebrati �asa iz %s"
@@ -10485,7 +10485,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "napaka RE: "
@@ -10507,16 +10507,16 @@ msgstr ""
 "\n"
 "Napaka pri zapiranju datoteke\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "malloc ni uspel"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10525,66 +10525,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Staro stanje:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10593,7 +10593,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
diff --git a/po/sv.po b/po/sv.po
index 0de6726b..95fec771 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2007-11-14 09:20+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -7808,25 +7808,25 @@ msgstr "%s: kan inte ta status på temporär fil.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: kan inte läsa temporär fil.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "ogiltigt årsvärde: använd 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "ogiltigt månadsvärde: använd 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "ogiltigt årsvärde: använd 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "användning: cal [-13smjyV] [[månad] år]\n"
@@ -9514,52 +9514,52 @@ msgstr "Misslyckades med att ställa in personlighet till %s"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "okänd"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS över TCP stöds inte.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "nräkn"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() misslyckades med att läsa tid från %s"
@@ -10572,7 +10572,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "RE-fel: "
@@ -10592,16 +10592,16 @@ msgstr "Öppning av %s misslyckades"
 msgid "error: uname failed"
 msgstr "Fel vid stängning av fil\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "minnesallokering misslyckades"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10610,66 +10610,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Tidigare situation:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10678,7 +10678,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "fel vid byte av rättigheter på %s: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 4177d169..fc278c96 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2006-03-06 15:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -7785,25 +7785,25 @@ msgstr "%s: geçici dosya durum bilgileri alınamıyor.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: geçici dosya okunamıyor.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "yıl değeri kuraldışı: 1-9999 arasında olmalı"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "ay numarası kuraldışı: 1..12 arasında olmalı"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "yıl değeri kuraldışı: 1-9999 arasında olmalı"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "kullanımı: cal [-13smjyV] [[ay] yıl]\n"
@@ -9484,52 +9484,52 @@ msgstr "%s disk bölümüne yazarken hata oluştu\n"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "bilinmeyen"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "TCP üzerinden NFS desteklenmiyor.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: açılamıyor: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "nsayısı"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() %s den zamanı okuyamadı"
@@ -10541,7 +10541,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "RE hatası:"
@@ -10563,16 +10563,16 @@ msgstr ""
 "\n"
 "Dosya kapatılırken hata\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "bellek ayrılamadı"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10581,66 +10581,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Eski durum:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10649,7 +10649,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "%s için kip değiştirilirken hata: %s\n"
diff --git a/po/uk.po b/po/uk.po
index 4d56d86c..d2281fb6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2006-04-06 10:45+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -7760,25 +7760,25 @@ msgstr "%s: не вдається отримати інформацію про 
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: не вдається прочитати тимчасовий файл.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "неправильне значення року: використовуйте 1-9999"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "неправильне значення місяця: використовуйте 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "неправильне значення року: використовуйте 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "використання: cal [-13smjyV] [[місяць] рік]\n"
@@ -9449,52 +9449,52 @@ msgstr "не вдається записати розділ на %s\n"
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "невідомий"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS через TCP не підтримується.\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 #, fuzzy
 msgid "current"
 msgstr "ncount"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "не вдається записати розділ на %s\n"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "не вдається записати розділ на %s\n"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "помилка зчитування часу у ioctl() з %s"
@@ -10505,7 +10505,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, fuzzy, c-format
 msgid "error: %s"
 msgstr "Помилка РВ: "
@@ -10527,16 +10527,16 @@ msgstr ""
 "\n"
 "Помилка закривання файлу\n"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 #, fuzzy
 msgid "error: malloc failed"
 msgstr "помилка виділення пам'яті"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10545,66 +10545,66 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Старий стан:\n"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10613,7 +10613,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, fuzzy, c-format
 msgid "error: change working directory to %s."
 msgstr "помилка зімни режиму доступу до %s: %s\n"
diff --git a/po/util-linux-ng.pot b/po/util-linux-ng.pot
index ff9706a1..d78864b0 100644
--- a/po/util-linux-ng.pot
+++ b/po/util-linux-ng.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7176,25 +7176,25 @@ msgstr ""
 msgid "%s: can't read temporary file.\n"
 msgstr ""
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr ""
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr ""
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr ""
@@ -8784,49 +8784,49 @@ msgstr ""
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, c-format
 msgid "unknown\n"
 msgstr ""
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 msgid "failed to parse pid"
 msgstr ""
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr ""
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 msgid "failed to parse priority"
 msgstr ""
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, c-format
 msgid "failed to execute %s"
 msgstr ""
@@ -9787,7 +9787,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, c-format
 msgid "error: %s"
 msgstr ""
@@ -9805,15 +9805,15 @@ msgstr ""
 msgid "error: uname failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 msgid "error: malloc failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -9822,65 +9822,65 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 msgid "Virtualization:"
 msgstr ""
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -9889,7 +9889,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, c-format
 msgid "error: change working directory to %s."
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 58a94bd6..0d8d45b4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-17 12:43+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2009-05-13 20:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -1029,7 +1029,8 @@ msgstr "mkfs (%s)\n"
 #: disk-utils/mkfs.cramfs.c:126
 #, c-format
 msgid ""
-"usage: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n name] dirname outfile\n"
+"usage: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n "
+"name] dirname outfile\n"
 " -h         print this help\n"
 " -v         be verbose\n"
 " -E         make all warnings errors (non-zero exit status)\n"
@@ -1044,7 +1045,8 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"sử dụng: %s [-h] [-v] [-b cỡ_khối] [-e bản_in] [-N về_cuối] [-i tập_tin] [-n tên] tên_thư_mục tập_tin_ra\n"
+"sử dụng: %s [-h] [-v] [-b cỡ_khối] [-e bản_in] [-N về_cuối] [-i tập_tin] [-n "
+"tên] tên_thư_mục tập_tin_ra\n"
 " -h         hiển thị trợ giúp này\n"
 " -v         xuất chi tiết\n"
 " -E         làm cho mọi cảnh báo là lỗi (trạng thái thoát khác số không)\n"
@@ -1069,7 +1071,8 @@ msgid ""
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
 "Tìm thấy tên tập tin rất dài (%zu bytes) « %s ».\n"
-" Xin hãy tăng giá trị « MAX_INPUT_NAMELEN » trong tập tin « mkcramfs.c » rồi biên dịch lại.  Đang thoát.\n"
+" Xin hãy tăng giá trị « MAX_INPUT_NAMELEN » trong tập tin « mkcramfs.c » rồi "
+"biên dịch lại.  Đang thoát.\n"
 
 #: disk-utils/mkfs.cramfs.c:472
 #, c-format
@@ -1088,8 +1091,12 @@ msgstr "%6.2f%% (%+ld byte)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:854
 #, c-format
-msgid "warning: guestimate of required size (upper bound) is %lldMB, but maximum image size is %uMB.  We might die prematurely.\n"
-msgstr "cảnh báo : số ước lượng của kích cỡ yêu cầu (giới hạn trên) là %lld MB, nhưng kích cỡ ảnh lớn nhất là %u MB.  Chúng ta có thể chết non.\n"
+msgid ""
+"warning: guestimate of required size (upper bound) is %lldMB, but maximum "
+"image size is %uMB.  We might die prematurely.\n"
+msgstr ""
+"cảnh báo : số ước lượng của kích cỡ yêu cầu (giới hạn trên) là %lld MB, "
+"nhưng kích cỡ ảnh lớn nhất là %u MB.  Chúng ta có thể chết non.\n"
 
 #: disk-utils/mkfs.cramfs.c:881
 msgid "ROM image map"
@@ -1151,13 +1158,19 @@ msgstr "cảnh báo : kích cỡ tập tin bị cắt ngắn thành %luMB (trừ
 
 #: disk-utils/mkfs.cramfs.c:958
 #, c-format
-msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "cảnh báo : UID bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo mật.)\n"
+msgid ""
+"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"cảnh báo : UID bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo "
+"mật.)\n"
 
 #: disk-utils/mkfs.cramfs.c:963
 #, c-format
-msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "cảnh báo : GID bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo mật.)\n"
+msgid ""
+"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"cảnh báo : GID bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo "
+"mật.)\n"
 
 #: disk-utils/mkfs.cramfs.c:968
 #, c-format
@@ -1165,7 +1178,8 @@ msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
 "that some device files will be wrong.\n"
 msgstr ""
-"CẢNH BÁO : số thiết bị cắt ngắn thành %u bit.  Điều này gần chắc chắn có nghĩa là\n"
+"CẢNH BÁO : số thiết bị cắt ngắn thành %u bit.  Điều này gần chắc chắn có "
+"nghĩa là\n"
 "một vài tập tin thiết bị sẽ bị hỏng.\n"
 
 #: disk-utils/mkfs.minix.c:156
@@ -1180,7 +1194,8 @@ msgstr "%s đã được gắn, sẽ không tạo hệ thống tập tin ở đ
 
 #: disk-utils/mkfs.minix.c:190
 msgid "seek to boot block failed in write_tables"
-msgstr "tìm tới khối khởi động không thành công trong write_tables (ghi các bảng)"
+msgstr ""
+"tìm tới khối khởi động không thành công trong write_tables (ghi các bảng)"
 
 #: disk-utils/mkfs.minix.c:192
 msgid "unable to clear boot sector"
@@ -1319,7 +1334,8 @@ msgstr "Kích cỡ trang do người dùng chỉ ra xấu %d\n"
 #: disk-utils/mkswap.c:159
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
-msgstr "Sử dụng kích cỡ trang do người dùng chỉ ra %d, thay cho giá trị hệ thống %d\n"
+msgstr ""
+"Sử dụng kích cỡ trang do người dùng chỉ ra %d, thay cho giá trị hệ thống %d\n"
 
 #: disk-utils/mkswap.c:183
 #, c-format
@@ -1344,7 +1360,8 @@ msgstr "không uuid\n"
 #: disk-utils/mkswap.c:272
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
-msgstr "Sử dụng: %s [-c] [-pKÍCH_CỠ_TRANG] [-L nhãn] [-U UUID] /dev/tên [các_khối]\n"
+msgstr ""
+"Sử dụng: %s [-c] [-pKÍCH_CỠ_TRANG] [-L nhãn] [-U UUID] /dev/tên [các_khối]\n"
 
 #: disk-utils/mkswap.c:286
 msgid "too many bad pages"
@@ -1483,8 +1500,11 @@ msgstr ""
 
 #: disk-utils/raw.c:122
 #, c-format
-msgid "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
-msgstr "Thiết bị « %s » là thiết bị thô điều khiển (hãy dùng thô<N> mà <N> lớn hơn số không)\n"
+msgid ""
+"Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
+msgstr ""
+"Thiết bị « %s » là thiết bị thô điều khiển (hãy dùng thô<N> mà <N> lớn hơn số "
+"không)\n"
 
 #: disk-utils/raw.c:130
 #, c-format
@@ -1583,7 +1603,8 @@ msgstr "Đĩa đã được thay đổi.\n"
 #: fdisk/cfdisk.c:413
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
-msgstr "Khởi động lại hệ thống để đảm bảo là bảng phân vùng được cập nhật đúng.\n"
+msgstr ""
+"Khởi động lại hệ thống để đảm bảo là bảng phân vùng được cập nhật đúng.\n"
 
 #: fdisk/cfdisk.c:417
 #, c-format
@@ -1655,11 +1676,13 @@ msgid "enlarged logical partitions overlap"
 msgstr "phân vùng lôgíc mở rộng chồng lên nhau"
 
 #: fdisk/cfdisk.c:999
-msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
+msgid ""
+"!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr "!!!! Lỗi nội bộ khi tạo các ổ lôgíc mà không có phân vùng mở rộng !!!!"
 
 #: fdisk/cfdisk.c:1010 fdisk/cfdisk.c:1022
-msgid "Cannot create logical drive here -- would create two extended partitions"
+msgid ""
+"Cannot create logical drive here -- would create two extended partitions"
 msgstr "Không thể tạo ổ lôgíc ở đây -- vì như thế sẽ tạo hai phân vùng mở rộng"
 
 #: fdisk/cfdisk.c:1164
@@ -1668,7 +1691,8 @@ msgstr "Mục trình đơn quá dài. Trình đơn có thể trông lạc lõng.
 
 #: fdisk/cfdisk.c:1220
 msgid "Menu without direction. Defaulting to horizontal."
-msgstr "Trình đơn không có phương hướng nên dùng thiết lập mặc định (nằm ngang)."
+msgstr ""
+"Trình đơn không có phương hướng nên dùng thiết lập mặc định (nằm ngang)."
 
 #: fdisk/cfdisk.c:1351
 msgid "Illegal key"
@@ -1765,8 +1789,11 @@ msgid "Opened disk read-only - you have no permission to write"
 msgstr "Mở đĩa chỉ đọc - bạn không có quyền ghi"
 
 #: fdisk/cfdisk.c:1682
-msgid "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
-msgstr "Cảnh báo :  phát hiện GPT (bảng phân vùng GUID) không được hỗ trợ. Hãy dùng chương trình GNU Parted."
+msgid ""
+"Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
+msgstr ""
+"Cảnh báo :  phát hiện GPT (bảng phân vùng GUID) không được hỗ trợ. Hãy dùng "
+"chương trình GNU Parted."
 
 #: fdisk/cfdisk.c:1701
 msgid "Cannot get disk size"
@@ -1785,7 +1812,8 @@ msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Cảnh báo : có thể sẽ xóa hết dữ liệu trên đĩa của bạn."
 
 #: fdisk/cfdisk.c:1876
-msgid "Are you sure you want to write the partition table to disk? (yes or no): "
+msgid ""
+"Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr "Bạn có chắc muốn ghi bảng phân vùng lên đĩa không? (có hoặc không): "
 
 #: fdisk/cfdisk.c:1882
@@ -1813,16 +1841,25 @@ msgid "Wrote partition table to disk"
 msgstr "Đã ghi bảng phân vùng lên đĩa"
 
 #: fdisk/cfdisk.c:1923
-msgid "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx(8) or reboot to update table."
-msgstr "Đã ghi bảng phân vùng, nhưng không đọc lại được bảng.  Hãy chạy công cụ partprobe(8) hay kpartx(8), hoặc khởi động lại để cập nhật bảng."
+msgid ""
+"Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
+"(8) or reboot to update table."
+msgstr ""
+"Đã ghi bảng phân vùng, nhưng không đọc lại được bảng.  Hãy chạy công cụ "
+"partprobe(8) hay kpartx(8), hoặc khởi động lại để cập nhật bảng."
 
 #: fdisk/cfdisk.c:1933
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr "Không có phân vùng chính nào được đánh dấu có thể khởi động. MBR (mục ghi khởi động chủ) của DOS không thể khởi động trong trường hợp này."
+msgstr ""
+"Không có phân vùng chính nào được đánh dấu có thể khởi động. MBR (mục ghi "
+"khởi động chủ) của DOS không thể khởi động trong trường hợp này."
 
 #: fdisk/cfdisk.c:1935
-msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this."
-msgstr "Có vài phân vùng chính được đánh dấu là có thể khởi động. MBR (mục ghi khởi động chủ) của DOS không thể khởi động trong trường hợp này."
+msgid ""
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Có vài phân vùng chính được đánh dấu là có thể khởi động. MBR (mục ghi khởi "
+"động chủ) của DOS không thể khởi động trong trường hợp này."
 
 #: fdisk/cfdisk.c:1993 fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 msgid "Enter filename or press RETURN to display on screen: "
@@ -1891,12 +1928,20 @@ msgid "               First       Last\n"
 msgstr "               Đầu         Cuối\n"
 
 #: fdisk/cfdisk.c:2134
-msgid " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) Flag\n"
-msgstr " # Loại       Rãnh ghi      Rãnh ghi   Hiệu    Độ dài    Kiểu hệ thống tập tin (ID) Cờ\n"
+msgid ""
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
+msgstr ""
+" # Loại       Rãnh ghi      Rãnh ghi   Hiệu    Độ dài    Kiểu hệ thống tập "
+"tin (ID) Cờ\n"
 
 #: fdisk/cfdisk.c:2135
-msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
-msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
+msgid ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+msgstr ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
 #: fdisk/cfdisk.c:2218
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
@@ -1908,7 +1953,8 @@ msgstr " #Cờ Rãnh Đầu  Trụ   ID  Rãnh Đầu  Trụ     Rãnh ghi    R
 
 #: fdisk/cfdisk.c:2220
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
-msgstr "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
+msgstr ""
+"-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
 #: fdisk/cfdisk.c:2253
 msgid "Raw"
@@ -1976,7 +2022,9 @@ msgstr "  d          Xóa phân vùng hiện thời"
 
 #: fdisk/cfdisk.c:2296
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
-msgstr "   g          Thay đổi các tham số : cylinders (hình trụ), heads (đầu đọc), sectors-per-track (số rãnh ghi trên mỗi rãnh)"
+msgstr ""
+"   g          Thay đổi các tham số : cylinders (hình trụ), heads (đầu đọc), "
+"sectors-per-track (số rãnh ghi trên mỗi rãnh)"
 
 #: fdisk/cfdisk.c:2297
 msgid "             WARNING: This option should only be used by people who"
@@ -2020,7 +2068,8 @@ msgstr "             mà bạn có thể chọn:"
 
 #: fdisk/cfdisk.c:2307
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr "                r - Dữ liệu thô (là những gì chính xác sẽ được ghi lên đĩa)"
+msgstr ""
+"                r - Dữ liệu thô (là những gì chính xác sẽ được ghi lên đĩa)"
 
 #: fdisk/cfdisk.c:2308
 msgid "                s - Table ordered by sectors"
@@ -2266,7 +2315,9 @@ msgstr "Lớn nhất"
 
 #: fdisk/cfdisk.c:2748
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr "Đặt phân vùng hiện thời dùng vùng lớn nhất có thể trên đĩa (chỉ dành cho người có kinh nghiệm)"
+msgstr ""
+"Đặt phân vùng hiện thời dùng vùng lớn nhất có thể trên đĩa (chỉ dành cho "
+"người có kinh nghiệm)"
 
 #: fdisk/cfdisk.c:2749
 msgid "New"
@@ -2635,7 +2686,8 @@ msgstr ""
 #: fdisk/fdiskbsdlabel.c:356
 #, c-format
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "#       đầu        cuối     kích cỡ     hệthống   [cỡ_tệp cỡ_khối   cpg]\n"
+msgstr ""
+"#       đầu        cuối     kích cỡ     hệthống   [cỡ_tệp cỡ_khối   cpg]\n"
 
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
@@ -2778,7 +2830,8 @@ msgstr ""
 "V.d.: fdisk /dev/hda  (cho đĩa IDE đầu tiên)\n"
 "  hay: fdisk /dev/sdc  (cho đĩa SCSI thứ ba)\n"
 "  hay: fdisk /dev/eda  (cho ổ PS/2 ESDI đầu tiên)\n"
-"  hay: fdisk /dev/rd/c0d0  hay: fdisk /dev/ida/c0d0  (cho các thiết bị RAID)\n"
+"  hay: fdisk /dev/rd/c0d0  hay: fdisk /dev/ida/c0d0  (cho các thiết bị "
+"RAID)\n"
 "  ...\n"
 
 #: fdisk/fdisk.c:265
@@ -3085,7 +3138,9 @@ msgstr ""
 
 #: fdisk/fdisk.c:1032
 #, c-format
-msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
+"disklabel\n"
 msgstr "Thiết bị chứa một bảng phân vùng DOS, hay Sun, SGI hay OSF bị lỗi\n"
 
 #: fdisk/fdisk.c:1049
@@ -3100,8 +3155,12 @@ msgstr "Bỏ qua các phân vùng mở rộng dự phòng %d\n"
 
 #: fdisk/fdisk.c:1074
 #, c-format
-msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
-msgstr "Cảnh báo : cờ 0x%04x của bảng phân vùng %d bị lỗi sẽ được sửa bởi w(rite) (ghi nhớ)\n"
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
+"(rite)\n"
+msgstr ""
+"Cảnh báo : cờ 0x%04x của bảng phân vùng %d bị lỗi sẽ được sửa bởi w(rite) "
+"(ghi nhớ)\n"
 
 #: fdisk/fdisk.c:1096
 #, c-format
@@ -3267,7 +3326,8 @@ msgstr "Kiểu hệ thống của phân vùng %d chưa thay đổi: %x (%s)\n"
 #: fdisk/fdisk.c:1591
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
-msgstr "Phân vùng %d có điểm khởi đầu vật lý/lôgíc khác nhay (không phải Linux?):\n"
+msgstr ""
+"Phân vùng %d có điểm khởi đầu vật lý/lôgíc khác nhay (không phải Linux?):\n"
 
 #: fdisk/fdisk.c:1593 fdisk/fdisk.c:1601 fdisk/fdisk.c:1610 fdisk/fdisk.c:1620
 #, c-format
@@ -3454,7 +3514,8 @@ msgstr "%lld rãnh ghi %d-byte không được phân phối\n"
 #: fdisk/fdisk.c:2025 fdisk/fdisksgilabel.c:633 fdisk/fdisksunlabel.c:416
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr "Phân vùng %d đã được xác định.  Hãy xóa nó trước khi thêm lại lần nữa\n"
+msgstr ""
+"Phân vùng %d đã được xác định.  Hãy xóa nó trước khi thêm lại lần nữa\n"
 
 #: fdisk/fdisk.c:2067
 #, c-format
@@ -3625,11 +3686,13 @@ msgstr "Cảnh báo : thiết lập hiệu số rãnh ghi cho tương thích DOS
 #, c-format
 msgid ""
 "\n"
-"WARNING: GPT (GUID Partition Table) detected on '%s'! The util fdisk doesn't support GPT. Use GNU Parted.\n"
+"WARNING: GPT (GUID Partition Table) detected on '%s'! The util fdisk doesn't "
+"support GPT. Use GNU Parted.\n"
 "\n"
 msgstr ""
 "\n"
-"CẢNH BÁO : phát hiện GPT (bảng phân vùng GUID) trên « %s ». Tiện ích fdisk không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
+"CẢNH BÁO : phát hiện GPT (bảng phân vùng GUID) trên « %s ». Tiện ích fdisk "
+"không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
 "\n"
 
 #: fdisk/fdisk.c:2533
@@ -3642,7 +3705,7 @@ msgstr "Đĩa %s không chứa một bảng phân vùng hợp lệ\n"
 msgid "Cannot open %s\n"
 msgstr "Không thể mở %s\n"
 
-#: fdisk/fdisk.c:2563 fdisk/sfdisk.c:2617
+#: fdisk/fdisk.c:2563 fdisk/sfdisk.c:2618
 #, c-format
 msgid "cannot open %s\n"
 msgstr "không thể mở %s\n"
@@ -3659,8 +3722,12 @@ msgstr "Nhân này tự tìm kích cỡ rãnh ghi - tùy chọn -b bị bỏ qua
 
 #: fdisk/fdisk.c:2657
 #, c-format
-msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
-msgstr "Cảnh báo: tùy chọn -b (đặt kích cỡ rãnh ghi) cần sử dụng với một thiết bị xác định\n"
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+"Cảnh báo: tùy chọn -b (đặt kích cỡ rãnh ghi) cần sử dụng với một thiết bị "
+"xác định\n"
 
 #: fdisk/fdisk.c:2717
 #, c-format
@@ -3798,8 +3865,12 @@ msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:164
 #, c-format
-msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
-msgstr "Tùy theo MIPS Computer Systems, Inc. thì Nhãn không được chứa nhiều hơn 512 byte\n"
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr ""
+"Tùy theo MIPS Computer Systems, Inc. thì Nhãn không được chứa nhiều hơn 512 "
+"byte\n"
 
 #: fdisk/fdisksgilabel.c:183
 #, c-format
@@ -4081,9 +4152,11 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:731 fdisk/fdisksunlabel.c:227
 #, c-format
 msgid ""
-"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %d.\n"
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
+"d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
-msgstr "Cảnh báo: BLKGETSIZE ioctl lỗi trên %s. Sử dụng giá trị cấu trúc trụ là %d.\n"
+msgstr ""
+"Cảnh báo: BLKGETSIZE ioctl lỗi trên %s. Sử dụng giá trị cấu trúc trụ là %d.\n"
 
 #: fdisk/fdisksgilabel.c:745
 #, c-format
@@ -4173,8 +4246,11 @@ msgstr "Tìm thấy nhãn đĩa Sun với số phân vùng (num_partitions) sai
 
 #: fdisk/fdisksunlabel.c:168
 #, c-format
-msgid "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
-msgstr "Cảnh báo : các giá trị không đúng cần phải được sửa chữa nên sẽ được sửa bởi w(rite) (ghi nhớ)\n"
+msgid ""
+"Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
+msgstr ""
+"Cảnh báo : các giá trị không đúng cần phải được sửa chữa nên sẽ được sửa bởi "
+"w(rite) (ghi nhớ)\n"
 
 #: fdisk/fdisksunlabel.c:198
 #, c-format
@@ -4818,18 +4894,28 @@ msgstr ""
 
 #: fdisk/sfdisk.c:610
 #, c-format
-msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr "%s của phân vùng %s có số đầu đọc không thể có: %lu (phải trong khoảng 0-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr ""
+"%s của phân vùng %s có số đầu đọc không thể có: %lu (phải trong khoảng 0-%"
+"lu)\n"
 
 #: fdisk/sfdisk.c:615
 #, c-format
-msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
-msgstr "%s của phân vùng %s có số rãnh ghi không thể có: %lu (phải trong khoảng 1-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
+"lu)\n"
+msgstr ""
+"%s của phân vùng %s có số rãnh ghi không thể có: %lu (phải trong khoảng 1-%"
+"lu)\n"
 
 #: fdisk/sfdisk.c:620
 #, c-format
-msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
-msgstr "%s của phân vùng %s có số trụ không thể có: %lu (phải trong khoảng 1-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
+"lu)\n"
+msgstr ""
+"%s của phân vùng %s có số trụ không thể có: %lu (phải trong khoảng 1-%lu)\n"
 
 #: fdisk/sfdisk.c:660
 #, c-format
@@ -5103,8 +5189,10 @@ msgstr "đầu"
 
 #: fdisk/sfdisk.c:1356
 #, c-format
-msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "phân vùng %s: đầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+msgid ""
+"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"phân vùng %s: đầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1362
 msgid "end"
@@ -5113,7 +5201,8 @@ msgstr "cuối"
 #: fdisk/sfdisk.c:1365
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "phân vùng %s: cuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+msgstr ""
+"phân vùng %s: cuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1368
 #, c-format
@@ -5298,15 +5387,19 @@ msgstr "    -l [hay --list]:      liệt kê các phân vùng của mỗi thiế
 
 #: fdisk/sfdisk.c:2310
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr "    -d [hay --dump]:      cũng như trên nhưng ở dạng có thể dùng cho nhập vào"
+msgstr ""
+"    -d [hay --dump]:      cũng như trên nhưng ở dạng có thể dùng cho nhập vào"
 
 #: fdisk/sfdisk.c:2311
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [hay --increment]: số trụ v.v... từ 1 thay vì từ 0"
 
 #: fdisk/sfdisk.c:2312
-msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
-msgstr "    -uS, -uB, -uC, -uM:  chấp nhận/báo cáo với đơn vị rãnh ghi/khối/trụ/MB"
+msgid ""
+"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
+"MB"
+msgstr ""
+"    -uS, -uB, -uC, -uM:  chấp nhận/báo cáo với đơn vị rãnh ghi/khối/trụ/MB"
 
 #: fdisk/sfdisk.c:2313
 msgid "    -T [or --list-types]:list the known partition types"
@@ -5314,7 +5407,9 @@ msgstr "    -T [hay --list-types]:\t\tliệt kê các kiểu phân vùng đã bi
 
 #: fdisk/sfdisk.c:2314
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
-msgstr "    -D [hay --DOS]:       để tương thích với DOS: lãng phí một chút khoảng trống"
+msgstr ""
+"    -D [hay --DOS]:       để tương thích với DOS: lãng phí một chút khoảng "
+"trống"
 
 #: fdisk/sfdisk.c:2315
 msgid "    -R [or --re-read]:   make kernel reread partition table"
@@ -5329,8 +5424,10 @@ msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 không thực sự viết lên đĩa"
 
 #: fdisk/sfdisk.c:2318
-msgid "    -O file :            save the sectors that will be overwritten to file"
-msgstr "    -O tập tin :            ghi các rãnh ghi sẽ bị ghi chèn vào tập tin"
+msgid ""
+"    -O file :            save the sectors that will be overwritten to file"
+msgstr ""
+"    -O tập tin :            ghi các rãnh ghi sẽ bị ghi chèn vào tập tin"
 
 #: fdisk/sfdisk.c:2319
 msgid "    -I file :            restore these sectors again"
@@ -5350,11 +5447,15 @@ msgstr "tùy chọn nguy hiểm:"
 
 #: fdisk/sfdisk.c:2323
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
-msgstr "    -g [hay --show-geometry]: in ra cấu trúc đĩa theo quan niệm của nhân"
+msgstr ""
+"    -g [hay --show-geometry]: in ra cấu trúc đĩa theo quan niệm của nhân"
 
 #: fdisk/sfdisk.c:2324
-msgid "    -G [or --show-pt-geometry]: print geometry guessed from the partition table"
-msgstr "    -G [hay --show-pt-geometry]: in ra cấu trúc dự đoán từ bảng phân vùng"
+msgid ""
+"    -G [or --show-pt-geometry]: print geometry guessed from the partition "
+"table"
+msgstr ""
+"    -G [hay --show-pt-geometry]: in ra cấu trúc dự đoán từ bảng phân vùng"
 
 #: fdisk/sfdisk.c:2325
 msgid ""
@@ -5366,8 +5467,11 @@ msgstr ""
 "                             trong đầu vào"
 
 #: fdisk/sfdisk.c:2327
-msgid "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
-msgstr "    -L  [hay --Linux]:     không than phiền về những gì không thích hợp với Linux"
+msgid ""
+"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+msgstr ""
+"    -L  [hay --Linux]:     không than phiền về những gì không thích hợp với "
+"Linux"
 
 #: fdisk/sfdisk.c:2328
 msgid "    -q  [or --quiet]:      suppress warning messages"
@@ -5409,85 +5513,88 @@ msgstr "%s thiết bị\t\t liệt kê phân vùng kích hoạt trên thiết b
 #: fdisk/sfdisk.c:2342
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr "%s thiết bị n1 n2 ... kích hoạt phân vùng n1 ..., bỏ kích hoạt phần còn lại\n"
+msgstr ""
+"%s thiết bị n1 n2 ... kích hoạt phân vùng n1 ..., bỏ kích hoạt phần còn lại\n"
 
 #: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An thiết bị\t kích hoạt phân vùng n, bỏ kích hoạt những cái khác\n"
 
-#: fdisk/sfdisk.c:2462
+#: fdisk/sfdisk.c:2463
 #, c-format
 msgid ""
 "\n"
-"WARNING: GPT (GUID Partition Table) detected on '%s'! The util sfdisk doesn't support GPT. Use GNU Parted.\n"
+"WARNING: GPT (GUID Partition Table) detected on '%s'! The util sfdisk "
+"doesn't support GPT. Use GNU Parted.\n"
 "\n"
 msgstr ""
 "\n"
-"CẢNH BÁO : phát hiện GPT (bảng phân vùng GUID) trên « %s ». Tiện ích sfdisk không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
+"CẢNH BÁO : phát hiện GPT (bảng phân vùng GUID) trên « %s ». Tiện ích sfdisk "
+"không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2465
+#: fdisk/sfdisk.c:2466
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Sử dụng cờ « --force » (bắt buộc) để bãi bỏ sự kiểm tra này.\n"
 
-#: fdisk/sfdisk.c:2504
+#: fdisk/sfdisk.c:2505
 msgid "no command?\n"
 msgstr "không lệnh?\n"
 
-#: fdisk/sfdisk.c:2636
+#: fdisk/sfdisk.c:2637
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "tổng sô: %llu khối\n"
 
-#: fdisk/sfdisk.c:2679
+#: fdisk/sfdisk.c:2680
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "sử dụng: sfdisk --print-id thiết-bị số-phân-vùng\n"
 
-#: fdisk/sfdisk.c:2681
+#: fdisk/sfdisk.c:2682
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "sử dụng: sfdisk --change-id thiết-bị số-phân-vùng Id\n"
 
-#: fdisk/sfdisk.c:2683
+#: fdisk/sfdisk.c:2684
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "sử dụng: sfdisk --id thiết-bị số-phân-vùng [Id]\n"
 
-#: fdisk/sfdisk.c:2690
+#: fdisk/sfdisk.c:2691
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "chỉ có thể chỉ ra một thiết bị (ngoại trừ với -l hay -s)\n"
 
-#: fdisk/sfdisk.c:2716
+#: fdisk/sfdisk.c:2717
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "không thể mở %s đọc-viết\n"
 
-#: fdisk/sfdisk.c:2718
+#: fdisk/sfdisk.c:2719
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "không mở được %s để đọc\n"
 
-#: fdisk/sfdisk.c:2743
+#: fdisk/sfdisk.c:2744
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2762 fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2763 fdisk/sfdisk.c:2796
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld trụ, %ld đầu đọc, %ld rãnh ghi/trac\n"
 
-#: fdisk/sfdisk.c:2814
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Không thể lấy kích cỡ của %s\n"
 
-#: fdisk/sfdisk.c:2894
+#: fdisk/sfdisk.c:2895
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte kích hoạt sai: 0x%x thay cho 0x80\n"
 
-#: fdisk/sfdisk.c:2912 fdisk/sfdisk.c:2967 fdisk/sfdisk.c:3000
+#: fdisk/sfdisk.c:2913 fdisk/sfdisk.c:2968 fdisk/sfdisk.c:3001
 msgid ""
 "Done\n"
 "\n"
@@ -5495,7 +5602,7 @@ msgstr ""
 "Hoàn thành\n"
 "\n"
 
-#: fdisk/sfdisk.c:2921
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5504,35 +5611,35 @@ msgstr ""
 "Bạn có %d phân vùng chính kích hoạt. Đây không phải là vấn đề cho LILO,\n"
 "nhưng MBR của DOS sẽ chỉ khởi động đĩa có 1 phân vùng kích hoạt.\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2938
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "phân vùng %s có id %x và không phải là ẩn\n"
 
-#: fdisk/sfdisk.c:2996
+#: fdisk/sfdisk.c:2997
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id xấu %lx\n"
 
-#: fdisk/sfdisk.c:3013
+#: fdisk/sfdisk.c:3014
 msgid "This disk is currently in use.\n"
 msgstr "Đĩa này hiện đang được sử dụng.\n"
 
-#: fdisk/sfdisk.c:3032
+#: fdisk/sfdisk.c:3033
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Lỗi nặng: không thể tìm %s\n"
 
-#: fdisk/sfdisk.c:3035
+#: fdisk/sfdisk.c:3036
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Cảnh báo: %s không phải là thiết bị khối\n"
 
-#: fdisk/sfdisk.c:3041
+#: fdisk/sfdisk.c:3042
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Đang kiểm tra xem có ai đó đang sử dụng đĩa này không...\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3044
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5541,33 +5648,34 @@ msgid ""
 msgstr ""
 "\n"
 "Đĩa này hiện thời đang được sử dụng - phân vùng lại không phải là ý muốn\n"
-"tốt. Bỏ gắn tất cả các hệ thống tập tin, và tắt (swapoff) các phân vùng trao đổi\n"
+"tốt. Bỏ gắn tất cả các hệ thống tập tin, và tắt (swapoff) các phân vùng trao "
+"đổi\n"
 "trên đĩa này. Sử dụng « --no-reread » để bỏ kiểm tra này.\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3048
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Sử dụng --force để bãi bỏ mọi kiểm tra.\n"
 
-#: fdisk/sfdisk.c:3051
+#: fdisk/sfdisk.c:3052
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3061
 #, c-format
 msgid "Old situation:\n"
 msgstr "Tình huống cũ:\n"
 
-#: fdisk/sfdisk.c:3064
+#: fdisk/sfdisk.c:3065
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Phân vùng %d không tồn tại, không thể thay đổi nó\n"
 
-#: fdisk/sfdisk.c:3072
+#: fdisk/sfdisk.c:3073
 #, c-format
 msgid "New situation:\n"
 msgstr "Tình huống mới:\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3078
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5575,21 +5683,21 @@ msgstr ""
 "Tôi không thích những phân vùng này - không có gì thay đổi.\n"
 "(Nếu bạn thực sự muốn điều này, sử dụng tùy chọn --force.)\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3081
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Tôi không thích điều này - bạn nên trả lời No\n"
 
-#: fdisk/sfdisk.c:3085
+#: fdisk/sfdisk.c:3086
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bạn có hài lòng với điều này? [ynq] "
 
-#: fdisk/sfdisk.c:3087
+#: fdisk/sfdisk.c:3088
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Bạn có muốn ghi lên đĩa? [ynq] "
 
-#: fdisk/sfdisk.c:3092
+#: fdisk/sfdisk.c:3093
 #, c-format
 msgid ""
 "\n"
@@ -5598,16 +5706,16 @@ msgstr ""
 "\n"
 "sfdisk: dữ liệu vào kết thúc sớm\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3095
 msgid "Quitting - nothing changed\n"
 msgstr "Đang thoát - không có gì thay đổi\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3101
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Xin hãy trả lời một trng y,n,q\n"
 
-#: fdisk/sfdisk.c:3108
+#: fdisk/sfdisk.c:3109
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5616,7 +5724,7 @@ msgstr ""
 "Viết thành công bảng phân vùng mới\n"
 "\n"
 
-#: fdisk/sfdisk.c:3114
+#: fdisk/sfdisk.c:3115
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5692,7 +5800,9 @@ msgstr "Không thể phân cấp bộ nhớ cho kiểu hệ thống tập tin\n"
 
 #: fsck/fsck.c:867
 #, c-format
-msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
+msgid ""
+"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
+"number\n"
 msgstr ""
 "%s: đang bỏ qua dòng sai trong tập tin « /etc/fstab »:\n"
 "điểm lắp đóng kết có số thứ tự lần chạy fsck khác số không\n"
@@ -5712,9 +5822,11 @@ msgid "--waiting-- (pass %d)\n"
 msgstr "--đang đợi-- (lần chạy %d)\n"
 
 #: fsck/fsck.c:1061
-msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
+msgid ""
+"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
-"Sử dụng: fsck [-AMNPRTV] [ -C [ fd ] ] [-t kiểu_HTTT] [các_tùy_chọn_HTTT] [HTTT ...]\n"
+"Sử dụng: fsck [-AMNPRTV] [ -C [ fd ] ] [-t kiểu_HTTT] [các_tùy_chọn_HTTT] "
+"[HTTT ...]\n"
 "\n"
 "HTTT: hệ thống tập tin\n"
 
@@ -5787,8 +5899,10 @@ msgid "              parameters\n"
 msgstr "              tham số\n"
 
 #: getopt/getopt.c:324
-msgid "  -a, --alternative            Allow long options starting with single -\n"
-msgstr "  -a, --alternative            Cho phép tùy chọn dài bắt đầu với một - đơn\n"
+msgid ""
+"  -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Cho phép tùy chọn dài bắt đầu với một - đơn\n"
 
 #: getopt/getopt.c:325
 msgid "  -h, --help                   This small usage guide\n"
@@ -5799,7 +5913,8 @@ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=tùychọndài   Tùy chọn dài cần nhận ra\n"
 
 #: getopt/getopt.c:327
-msgid "  -n, --name=progname          The name under which errors are reported\n"
+msgid ""
+"  -n, --name=progname          The name under which errors are reported\n"
 msgstr "  -n, --name=tên_chương_trình          Báo cáo lỗi dưới tên này\n"
 
 #: getopt/getopt.c:328
@@ -5901,7 +6016,8 @@ msgstr "Tôi lấy thông tin quyền hạn không thành công vì đã không
 #: hwclock/cmos.c:584
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
-msgstr "Không thể dùng %s để lấy truy cập cổng V/R:  gọi iopl(3) không thành công.\n"
+msgstr ""
+"Không thể dùng %s để lấy truy cập cổng V/R:  gọi iopl(3) không thành công.\n"
 
 #: hwclock/cmos.c:587
 #, c-format
@@ -5924,7 +6040,8 @@ msgstr "nội bộ"
 #: hwclock/hwclock.c:312
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
-msgstr "%s: Cảnh báo: không nhận ra dòng thứ ba trong tập tin điều chỉnh thời gian\n"
+msgstr ""
+"%s: Cảnh báo: không nhận ra dòng thứ ba trong tập tin điều chỉnh thời gian\n"
 
 #: hwclock/hwclock.c:314
 #, c-format
@@ -5968,12 +6085,15 @@ msgstr "...đã nghe thấy tiếng tíc tắc\n"
 #: hwclock/hwclock.c:413
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr "Giá trị không đúng trong đồng hồ phần cứng: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
+"Giá trị không đúng trong đồng hồ phần cứng: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
 #: hwclock/hwclock.c:421
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr "Thời gian đồng hồ phần cứng : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld giây kể từ năm 1969\n"
+msgstr ""
+"Thời gian đồng hồ phần cứng : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld giây kể từ "
+"năm 1969\n"
 
 #: hwclock/hwclock.c:451
 #, c-format
@@ -6001,8 +6121,12 @@ msgstr ""
 
 #: hwclock/hwclock.c:572
 #, c-format
-msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
-msgstr "Đồng hồ Phần cứng chứa các giá trị hoặc không đúng (v.d. ngày thứ 50 của tháng) hoặc vượt quá phạm vi chúng ta có thể điều khiển (v.d. Năm 2095).\n"
+msgid ""
+"The Hardware Clock registers contain values that are either invalid (e.g. "
+"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr ""
+"Đồng hồ Phần cứng chứa các giá trị hoặc không đúng (v.d. ngày thứ 50 của "
+"tháng) hoặc vượt quá phạm vi chúng ta có thể điều khiển (v.d. Năm 2095).\n"
 
 #: hwclock/hwclock.c:582
 #, c-format
@@ -6060,13 +6184,15 @@ msgstr ""
 #: hwclock/hwclock.c:663
 #, c-format
 msgid ""
-"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
-"Câu lệnh date (ngày tháng) đưa ra bởi %s trả lại kết quả không phải là một số nguyên, trong khi mong đợi giá trị thời gian đã chuyển đổi.\n"
+"Câu lệnh date (ngày tháng) đưa ra bởi %s trả lại kết quả không phải là một "
+"số nguyên, trong khi mong đợi giá trị thời gian đã chuyển đổi.\n"
 "Câu lệnh là:\n"
 "  %s\n"
 "Kết quả là:\n"
@@ -6079,8 +6205,12 @@ msgstr "chuỗi ngày tháng %s bằng %ld giây kể từ năm 1969.\n"
 
 #: hwclock/hwclock.c:706
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
-msgstr "Đồng hồ Phần cứng không chứa thời gian thích hợp, vì thế chúng ta không thể đặt Thời gian của Hệ thống từ đó.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"Đồng hồ Phần cứng không chứa thời gian thích hợp, vì thế chúng ta không thể "
+"đặt Thời gian của Hệ thống từ đó.\n"
 
 #: hwclock/hwclock.c:728 hwclock/hwclock.c:804
 #, c-format
@@ -6100,7 +6230,8 @@ msgstr "\ttz.tz_minuteswest = %d\n"
 #: hwclock/hwclock.c:734 hwclock/hwclock.c:811
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
-msgstr "Không thiết lập đồng hồ hệ thống bở vì đang chạy trong chế độ thử nghiệm.\n"
+msgstr ""
+"Không thiết lập đồng hồ hệ thống bở vì đang chạy trong chế độ thử nghiệm.\n"
 
 #: hwclock/hwclock.c:743 hwclock/hwclock.c:820
 #, c-format
@@ -6123,7 +6254,9 @@ msgstr "\tUTC: %s\n"
 
 #: hwclock/hwclock.c:852
 #, c-format
-msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
 msgstr "Không chỉnh độ lệnh thời gian vì Đồng hồ phần cứng chứa rác.\n"
 
 #: hwclock/hwclock.c:857
@@ -6137,16 +6270,22 @@ msgstr ""
 
 #: hwclock/hwclock.c:863
 #, c-format
-msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
-msgstr "Không chỉnh độ lệnh thời gian vì nó nhỏ hơn một ngày kể từ lần định thời gian cuối cùng.\n"
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"Không chỉnh độ lệnh thời gian vì nó nhỏ hơn một ngày kể từ lần định thời "
+"gian cuối cùng.\n"
 
 #: hwclock/hwclock.c:911
 #, c-format
 msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
+"of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"Đồng hồ chạy sai lệch %.1f giây trong số %d giây đã qua, và đi ngược lạiđộ sai lệch %f giây/ngày.\n"
+"Đồng hồ chạy sai lệch %.1f giây trong số %d giây đã qua, và đi ngược lạiđộ "
+"sai lệch %f giây/ngày.\n"
 "Chỉnh lại độ sai lệch %f giây/ngày\n"
 
 #: hwclock/hwclock.c:961
@@ -6175,7 +6314,9 @@ msgstr ""
 
 #: hwclock/hwclock.c:1001
 #, c-format
-msgid "Could not open file with the clock adjustment parameters in it (%s) for writing"
+msgid ""
+"Could not open file with the clock adjustment parameters in it (%s) for "
+"writing"
 msgstr "Không thể mở tập tin chứa các tham số điều chỉnh đồng hồ (%s) để ghi"
 
 #: hwclock/hwclock.c:1006 hwclock/hwclock.c:1011
@@ -6190,13 +6331,19 @@ msgstr "Không cập nhật các tham số chỉnh sai lệch.\n"
 
 #: hwclock/hwclock.c:1058
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr "Đồng hồ Phần cứng không có thời gian thích hợp, vì thế chúng ta không thể chỉnh.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+"Đồng hồ Phần cứng không có thời gian thích hợp, vì thế chúng ta không thể "
+"chỉnh.\n"
 
 #: hwclock/hwclock.c:1066
 #, c-format
-msgid "Not setting clock because last adjustment time is zero, so history is bad."
-msgstr "Sẽ không đặt đồng hồ vì thời gian điều chỉnh cuối cùng là số không thì lịch sử sai."
+msgid ""
+"Not setting clock because last adjustment time is zero, so history is bad."
+msgstr ""
+"Sẽ không đặt đồng hồ vì thời gian điều chỉnh cuối cùng là số không thì lịch "
+"sử sai."
 
 #: hwclock/hwclock.c:1089
 #, c-format
@@ -6226,7 +6373,8 @@ msgstr "Đồng hồ theo UTC nên không thay đổi gì.\n"
 #: hwclock/hwclock.c:1259
 #, c-format
 msgid ""
-"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n"
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
+"machine.\n"
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
@@ -6246,8 +6394,12 @@ msgstr "Nhân đang giữ giá trị khởi đầu là %lu\n"
 
 #: hwclock/hwclock.c:1273
 #, c-format
-msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
-msgstr "Để đặt giá trị khởi đầu, bạn cần sử dụng tùy chọn 'epoch' để thông báo giá trị muốn đặt.\n"
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+"Để đặt giá trị khởi đầu, bạn cần sử dụng tùy chọn 'epoch' để thông báo giá "
+"trị muốn đặt.\n"
 
 #: hwclock/hwclock.c:1276
 #, c-format
@@ -6312,11 +6464,13 @@ msgstr ""
 "  -r | --show         đọc đồng hồ phần cứng và in ra kết quả\n"
 "       --set          đặt rtc thành thời gian đưa ra, dùng « --date »\n"
 "  -s | --hctosys      đặt thời gian hệ thống từ đồng hồ phần cứng\n"
-"  -w | --systohc      đặt đồng hồ phần cứng thành thời gian hệ thống hiện thời\n"
+"  -w | --systohc      đặt đồng hồ phần cứng thành thời gian hệ thống hiện "
+"thời\n"
 "       --systz        đặt thời gian hệ thống dựa vào múi giờ hiện thời\n"
 "       --adjust       điều chỉnh rtc để tính đến độ lệch có hệ thống\n"
 "\t\t\t\tkế từ lần cuối cùng đặt hay chỉnh đồng hồ\n"
-"       --getepoch     in ra giá trị thời điểm đồng hồ phần cứng của hạt nhân\n"
+"       --getepoch     in ra giá trị thời điểm đồng hồ phần cứng của hạt "
+"nhân\n"
 "       --setepoch     đặt giá trị thời điểm đồng hồ phần cứng của hạt nhân\n"
 "\t\t\t\tthành giá trị đưa ra dùng « --epoch »\n"
 "  -v | --version      in ra đầu ra tiêu chuẩn phiên bản của hwclock\n"
@@ -6324,11 +6478,13 @@ msgstr ""
 "Tuỳ chọn: \n"
 "  -u | --utc          đồng hồ phần cứng tính theo UTC\n"
 "       --localtime    đồng hồ phần cứng tính theo thời gian cục bộ\n"
-"  -f | --rtc=đường_dẫn     tập tin « /dev/... » đặc biệt cần dùng thay cho mặc định\n"
+"  -f | --rtc=đường_dẫn     tập tin « /dev/... » đặc biệt cần dùng thay cho "
+"mặc định\n"
 "       --directisa    truy cập trực tiếp mạch nối ISA thay cho %s\n"
 "       --badyear      lờ đi năm của rtc vì BIOS bị hỏng\n"
 "       --date         ghi rõ thời gian cần đặt trong đồng hồ phần cứng\n"
-"       --epoch=năm   ghi rõ năm là đầu của giá trị thời điểm đồng hồ phần cứng\n"
+"       --epoch=năm   ghi rõ năm là đầu của giá trị thời điểm đồng hồ phần "
+"cứng\n"
 "       --noadjfile    đừng truy cập đến « /etc/adjtime ».\n"
 "\t\t\t\tCần dùng hoặc « --utc » hoặc « --localtime »\n"
 "       --adjfile=đường_dẫn\tghi rõ đường dẫn đến tập tin điều chỉnh\n"
@@ -6370,18 +6526,30 @@ msgstr ""
 
 #: hwclock/hwclock.c:1567
 #, c-format
-msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
-msgstr "%s: Các tùy chọn « --utc » và « --localtime » loại trừ lẫn nhau.  Bạn lại đưa ra cả hai.\n"
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr ""
+"%s: Các tùy chọn « --utc » và « --localtime » loại trừ lẫn nhau.  Bạn lại đưa "
+"ra cả hai.\n"
 
 #: hwclock/hwclock.c:1574
 #, c-format
-msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
-msgstr "%s: Các tùy chọn « --adjust » và « --noadjust » loại trừ lẫn nhau.  Bạn lại đưa ra cả hai.\n"
+msgid ""
+"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
+"specified both.\n"
+msgstr ""
+"%s: Các tùy chọn « --adjust » và « --noadjust » loại trừ lẫn nhau.  Bạn lại "
+"đưa ra cả hai.\n"
 
 #: hwclock/hwclock.c:1581
 #, c-format
-msgid "%s: The --adjfile and --noadjfile options are mutually exclusive.  You specified both.\n"
-msgstr "%s: Các tùy chọn « --adjfile » và « --noadjfile » loại trừ lẫn nhau.  Bạn lại đưa ra cả hai.\n"
+msgid ""
+"%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
+"specified both.\n"
+msgstr ""
+"%s: Các tùy chọn « --adjfile » và « --noadjfile » loại trừ lẫn nhau.  Bạn lại "
+"đưa ra cả hai.\n"
 
 #: hwclock/hwclock.c:1590
 #, c-format
@@ -6396,27 +6564,38 @@ msgstr "Không có thời gian set-to nào có thể sử dụng. Không thể 
 #: hwclock/hwclock.c:1621
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr "Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Phần cứng.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Phần cứng.\n"
 
 #: hwclock/hwclock.c:1626
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr "Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Hệ thống.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Hệ thống.\n"
 
 #: hwclock/hwclock.c:1631
 #, c-format
-msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
-msgstr "Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi khởi đầu củaĐồng hồ Phần cứng trong nhân.\n"
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi khởi đầu củaĐồng hồ "
+"Phần cứng trong nhân.\n"
 
 #: hwclock/hwclock.c:1651
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr "Không thể truy cập tới Đồng hồ Phần cứng qua một phương pháp không rõ.\n"
+msgstr ""
+"Không thể truy cập tới Đồng hồ Phần cứng qua một phương pháp không rõ.\n"
 
 #: hwclock/hwclock.c:1655
 #, c-format
-msgid "Use the --debug option to see the details of our search for an access method.\n"
-msgstr "Sử dụng tùy chọn --debug để xem chi tiết về quá trình tìm kiếm phương pháp truy cập của chúng ta.\n"
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr ""
+"Sử dụng tùy chọn --debug để xem chi tiết về quá trình tìm kiếm phương pháp "
+"truy cập của chúng ta.\n"
 
 #: hwclock/kd.c:53
 #, c-format
@@ -6496,7 +6675,9 @@ msgstr "ioctl() tới %s để tắt việc gián đoạn cập nhật không th
 #: hwclock/rtc.c:303
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr "ioctl() tới %s để bật việc gián đoạn cập nhật không thành công một cách bất thường"
+msgstr ""
+"ioctl() tới %s để bật việc gián đoạn cập nhật không thành công một cách bất "
+"thường"
 
 #: hwclock/rtc.c:360
 #, c-format
@@ -6515,8 +6696,14 @@ msgstr "Mở %s không thành công"
 
 #: hwclock/rtc.c:410 hwclock/rtc.c:454
 #, c-format
-msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
-msgstr "Để điều khiển giá trị khởi đầu (epoch) trong nhân, chúng ta cần truy cập tới driver thiết bị 'rtc' qua tập tin thiết bị đặc biệt %s.  Tập tin này không tồn tại trên hệ thống.\n"
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
+msgstr ""
+"Để điều khiển giá trị khởi đầu (epoch) trong nhân, chúng ta cần truy cập tới "
+"driver thiết bị 'rtc' qua tập tin thiết bị đặc biệt %s.  Tập tin này không "
+"tồn tại trên hệ thống.\n"
 
 #: hwclock/rtc.c:415 hwclock/rtc.c:459
 #, c-format
@@ -6536,17 +6723,21 @@ msgstr "chúng ta đọc khởi đầu (epoch) %ld từ %s bằng RTC_EPOCH_READ
 #: hwclock/rtc.c:446
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr "Giá trị khởi đầu (epoch) không được nhỏ hơn 1900.  Bạn đã yêu cầu %ld\n"
+msgstr ""
+"Giá trị khởi đầu (epoch) không được nhỏ hơn 1900.  Bạn đã yêu cầu %ld\n"
 
 #: hwclock/rtc.c:464
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
-msgstr "thiết lập khởi đầu (epoch) thành %ld bằng RTC_EPOCH_SET ioctl tới %s.\n"
+msgstr ""
+"thiết lập khởi đầu (epoch) thành %ld bằng RTC_EPOCH_SET ioctl tới %s.\n"
 
 #: hwclock/rtc.c:469
 #, c-format
-msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr "Trình điều khiển thiết bị của nhân cho %s không có RTC_EPOCH_SET ioctl.\n"
+msgid ""
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr ""
+"Trình điều khiển thiết bị của nhân cho %s không có RTC_EPOCH_SET ioctl.\n"
 
 #: hwclock/rtc.c:472
 #, c-format
@@ -6631,16 +6822,20 @@ msgstr "%s: đọc: %m"
 msgid "%s: input overrun"
 msgstr "%s: thừa dữ liệu vào"
 
-#: login-utils/agetty.c:1203
+#: login-utils/agetty.c:1207
 #, c-format
 msgid ""
-"Usage: %s [-8hiLmUw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"
+"Usage: %s [-8hiLmUw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
 msgstr ""
 "Sử dụng:\n"
-"%s [-8hiLmUw] [-l trình_đăng_nhập] [-t thời_hạn] [-I chuỗi_sơ_khởi] [-H máy_đăng_nhập] tốc_độ_bốt,... dòng [kiểu_thiết_bị_cuối]\n"
+"%s [-8hiLmUw] [-l trình_đăng_nhập] [-t thời_hạn] [-I chuỗi_sơ_khởi] [-H "
+"máy_đăng_nhập] tốc_độ_bốt,... dòng [kiểu_thiết_bị_cuối]\n"
 "hoặc\n"
-"[-hiLmw] [-l trình_đăng_nhập] [-t thời_hạn] [-I chuỗi_sơ_khởi] [-H máy_đăng_nhập] dòng tốc_độ_bốt,... [kiểu_thiết_bị_cuối]\n"
+"[-hiLmw] [-l trình_đăng_nhập] [-t thời_hạn] [-I chuỗi_sơ_khởi] [-H "
+"máy_đăng_nhập] dòng tốc_độ_bốt,... [kiểu_thiết_bị_cuối]\n"
 
 #: login-utils/checktty.c:91 login-utils/checktty.c:112
 #, c-format
@@ -6705,8 +6900,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM thất bại nên hủy bỏ : %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:727
-#: mount/lomount.c:730
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
+#: mount/lomount.c:734
 msgid "Password: "
 msgstr "Mật khẩu: "
 
@@ -6791,13 +6986,19 @@ msgstr "%s: %s chưa được xác thực để thay đổi trình bao của %s\
 
 #: login-utils/chsh.c:164
 #, c-format
-msgid "%s: Running UID doesn't match UID of user we're altering, shell change denied\n"
-msgstr "%s: UID đang hoạt động không tương ứng với UID của người dùng chúng ta đang nhập, không được phép thay đổi trình bao\n"
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+"%s: UID đang hoạt động không tương ứng với UID của người dùng chúng ta đang "
+"nhập, không được phép thay đổi trình bao\n"
 
 #: login-utils/chsh.c:170
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr "%s: Trình bao của bạn không có trong /etc/shells, không cho phép thay đổi trình bao\n"
+msgstr ""
+"%s: Trình bao của bạn không có trong /etc/shells, không cho phép thay đổi "
+"trình bao\n"
 
 #: login-utils/chsh.c:177
 #, c-format
@@ -6889,7 +7090,8 @@ msgstr "Không mở được %s để đọc nên thoát."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr "sử dụng: last [-#] [-f tập_tin] [-t tty] [-h tên_máy] [người_dùng ...]\n"
+msgstr ""
+"sử dụng: last [-#] [-f tập_tin] [-t tty] [-h tên_máy] [người_dùng ...]\n"
 
 #: login-utils/last.c:284
 msgid "  still logged in"
@@ -7565,25 +7767,25 @@ msgstr "%s: không lấy được trạng thái (stat) tập tin tạm thời.\n
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: không đọc được tập tin tạm thời.\n"
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "giá trị ngày bị sai: hãy dùng 1-%d"
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr "giá trị tháng bị sai: hãy dùng 1-12"
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr "giá trị năm bị sai: hãy dùng 1-9999"
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "sử dụng: cal [-13smjyV] [[[ngày] tháng] năm]\n"
@@ -7654,8 +7856,11 @@ msgstr "logger: không rõ tên quyền ưu tiên: %s.\n"
 
 #: misc-utils/logger.c:285
 #, c-format
-msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr "Sử dụng: logger [-is] [-f tập_tin] [-p ưu_tiên] [-t thẻ] [-u ổ_cắm] [ thông_báo ... ]\n"
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr ""
+"Sử dụng: logger [-is] [-f tập_tin] [-p ưu_tiên] [-t thẻ] [-u ổ_cắm] "
+"[ thông_báo ... ]\n"
 
 #: misc-utils/look.c:351
 #, c-format
@@ -7915,7 +8120,8 @@ msgstr "  [ -repeat [on|off] ]\t\tlặp lại [bật|tắt]\n"
 #: misc-utils/setterm.c:775
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
-msgstr "  [ -appcursorkeys [on|off] ]\t\tcác phím con trỏ của ứng dụng [bật|tắt]\n"
+msgstr ""
+"  [ -appcursorkeys [on|off] ]\t\tcác phím con trỏ của ứng dụng [bật|tắt]\n"
 
 #: misc-utils/setterm.c:776
 #, c-format
@@ -8274,111 +8480,114 @@ msgstr "lỗi thay đổi chủ sở hữu của %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "không đổi tên được %s thành %s: %s\n"
 
-#: mount/lomount.c:364
+#: mount/lomount.c:368
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", bù %<PRIu64>"
 
-#: mount/lomount.c:367
+#: mount/lomount.c:371
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", hạn_cỡ %<PRIu64>"
 
-#: mount/lomount.c:375
+#: mount/lomount.c:379
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", mã_hoá %s (kiểu %<PRIu32>)"
 
-#: mount/lomount.c:388
+#: mount/lomount.c:392
 #, c-format
 msgid ", offset %d"
 msgstr ", bù %d"
 
-#: mount/lomount.c:391
+#: mount/lomount.c:395
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", dạng mã hóa %d\n"
 
-#: mount/lomount.c:399
+#: mount/lomount.c:403
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: không lấy được thông tin trên thiết bị %s: %s\n"
 
-#: mount/lomount.c:410
+#: mount/lomount.c:414
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: không mở được thiết bị %s: %s\n"
 
-#: mount/lomount.c:426 mount/lomount.c:458 mount/lomount.c:523
-#: mount/lomount.c:572
+#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
+#: mount/lomount.c:576
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: thư mục « /dev » không tồn tại."
 
-#: mount/lomount.c:437 mount/lomount.c:585
+#: mount/lomount.c:441 mount/lomount.c:589
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: không có quyền xem /dev/loop%s<N>"
 
-#: mount/lomount.c:588
+#: mount/lomount.c:592
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: không tìm thấy thiết bị vòng lặp nào còn trống"
 
-#: mount/lomount.c:591
+#: mount/lomount.c:595
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 "%s: Không tìm thấy bất kỳ thiết bị vòng lặp nào. Có thể nhân này không biết\n"
-"       về thiết bị vòng lặp? (Nếu vậy, hãy biên dịch lại hoặc thử `modprobe loop'.)"
+"       về thiết bị vòng lặp? (Nếu vậy, hãy biên dịch lại hoặc thử `modprobe "
+"loop'.)"
 
-#: mount/lomount.c:621
+#: mount/lomount.c:625
 msgid "Out of memory while reading passphrase"
 msgstr "Không đủ bộ nhớ khi đọc cụm từ mật khẩu"
 
-#: mount/lomount.c:664
+#: mount/lomount.c:668
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "cảnh báo : %s đã liên quan đến %s\n"
 
-#: mount/lomount.c:680
+#: mount/lomount.c:684
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "cảnh báo : %s: được bảo vệ chống ghi nên đặt chỉ-đọc.\n"
 
-#: mount/lomount.c:716
+#: mount/lomount.c:720
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Không khóa được vào bộ nhớ, đang thoát.\n"
 
-#: mount/lomount.c:743
+#: mount/lomount.c:747
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD bị lỗi: %s\n"
 
-#: mount/lomount.c:800
+#: mount/lomount.c:804
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): thành công\n"
 
-#: mount/lomount.c:821
+#: mount/lomount.c:825
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): thành công\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:829
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: không xóa được thiết bị %s: %s\n"
 
-#: mount/lomount.c:836
+#: mount/lomount.c:840
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "Phiên bản mount này được biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch lại.\n"
+msgstr ""
+"Phiên bản mount này được biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch "
+"lại.\n"
 
-#: mount/lomount.c:871
+#: mount/lomount.c:875
 #, c-format
 msgid ""
 "\n"
@@ -8387,7 +8596,8 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
-" %1$s -j | --associated <file> [-o <num>]     list all associated with <file>\n"
+" %1$s -j | --associated <file> [-o <num>]     list all associated with "
+"<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 "\n"
@@ -8402,7 +8612,7 @@ msgstr ""
 "\n"
 "TBVL: thiết bị vòng lặp\n"
 
-#: mount/lomount.c:880
+#: mount/lomount.c:884
 #, c-format
 msgid ""
 "\n"
@@ -8422,29 +8632,30 @@ msgstr ""
 " -e | --encryption <kiểu>\tbật mã hoá dữ liệu với <tên/số> đã ghi rõ\n"
 " -h | --help              \t\ttrợ giúp này\n"
 " -o | --offset <số>      \t\tbắt đầu ở khoảng bù số này trong tập tin\n"
-"      --sizelimit <số>   \tvòng lặp bị hạn chế thành chỉ <số> byte của tập tin\n"
+"      --sizelimit <số>   \tvòng lặp bị hạn chế thành chỉ <số> byte của tập "
+"tin\n"
 " -p | --pass-fd <số>\t\tđọc cụm từ mật khẩu từ bộ mô tả tập tin <số>\n"
 " -r | --read-only         \t\tthiết lập thiết bị vòng lặp chỉ đọc\n"
 "      --show              \t\tin ra tên thiết bị (với « -f <tập_tin> »)\n"
 " -v | --verbose          \t\tchế độ chi tiết\n"
 "\n"
 
-#: mount/lomount.c:1010 mount/lomount.c:1048
+#: mount/lomount.c:1014 mount/lomount.c:1052
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Thiết bị vòng lặp là %s\n"
 
-#: mount/lomount.c:1035
+#: mount/lomount.c:1039
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "vòng lặp bị ăn cắp=%s... nên thử lại\n"
 
-#: mount/lomount.c:1045
+#: mount/lomount.c:1049
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: thiết bị đang bận"
 
-#: mount/lomount.c:1062
+#: mount/lomount.c:1066
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch lại.\n"
@@ -8611,8 +8822,11 @@ msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: theo như mtab thì %s đã gắn vào %s\n"
 
 #: mount/mount.c:1358
-msgid "mount: I could not determine the filesystem type, and none was specified"
-msgstr "mount: không thể nhận ra kiểu hệ thống tập tin, và người dùng không chỉ ra kiểu nào"
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr ""
+"mount: không thể nhận ra kiểu hệ thống tập tin, và người dùng không chỉ ra "
+"kiểu nào"
 
 #: mount/mount.c:1361
 msgid "mount: you must specify the filesystem type"
@@ -8754,12 +8968,15 @@ msgstr "mount: có thể muốn đặt 'vfat'?"
 #: mount/mount.c:1493
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr "mount: %s có số hiệu thiết bị sai hoặc chưa hỗ trợ kiểu hệ thống tập tin %s"
+msgstr ""
+"mount: %s có số hiệu thiết bị sai hoặc chưa hỗ trợ kiểu hệ thống tập tin %s"
 
 #: mount/mount.c:1501
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s không phải là một thiết bị khối, và stat (lấy trạng thái) không thành công?"
+msgstr ""
+"mount: %s không phải là một thiết bị khối, và stat (lấy trạng thái) không "
+"thành công?"
 
 #: mount/mount.c:1503
 #, c-format
@@ -8833,12 +9050,16 @@ msgstr ""
 #: mount/mount.c:1651
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
-msgstr "mount: không đưa ra kiểu hệ thống tập tin nên coi như nfs vì có dấu hai chấm\n"
+msgstr ""
+"mount: không đưa ra kiểu hệ thống tập tin nên coi như nfs vì có dấu hai "
+"chấm\n"
 
 #: mount/mount.c:1657
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
-msgstr "mount: không đưa ra kiểu hệ thống tập tin nên giả sử smbfs vì có // đằng trước\n"
+msgstr ""
+"mount: không đưa ra kiểu hệ thống tập tin nên giả sử smbfs vì có // đằng "
+"trước\n"
 
 #: mount/mount.c:1752
 #, c-format
@@ -8996,7 +9217,8 @@ msgstr ""
 "Sử dụng:\n"
 " %1$s -a [-e] [-v] [-f]         bật tất cả các vùng trao đổi từ /etc/fstab\n"
 " %1$s [-p ưu_tiên] [-v] [-f] <đặc_biệt>  bật vùng trao đổi đưa ra\n"
-" %1$s -s                            hiển thị lược sử về cách sử dụng vùng trao đổi\n"
+" %1$s -s                            hiển thị lược sử về cách sử dụng vùng "
+"trao đổi\n"
 " %1$s -h                            hiển thị trợ giúp\n"
 " %1$s -V                            hiển thị phiên bản\n"
 "\n"
@@ -9061,7 +9283,8 @@ msgstr "%s: lỗi ghi chữ ký"
 #: mount/swapon.c:343
 #, c-format
 msgid "%s: found %sswap v%d signature string for %d KiB PAGE_SIZE\n"
-msgstr "%s: tìm thấy chuỗi chữ ký vùng trao đổi %s v%d cho %d KiB KÍCH_CỠ_TRANG\n"
+msgstr ""
+"%s: tìm thấy chuỗi chữ ký vùng trao đổi %s v%d cho %d KiB KÍCH_CỠ_TRANG\n"
 
 #: mount/swapon.c:363
 #, c-format
@@ -9100,8 +9323,11 @@ msgstr "%s: kích cỡ trang định dạng trao đổi không tương ứng."
 
 #: mount/swapon.c:424
 #, c-format
-msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
-msgstr "%s: kích cỡ trang định dạng trao đổi không tương ứng. (Dùng --fixpgsz để sơ khởi lại nó.)"
+msgid ""
+"%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
+msgstr ""
+"%s: kích cỡ trang định dạng trao đổi không tương ứng. (Dùng --fixpgsz để sơ "
+"khởi lại nó.)"
 
 #: mount/swapon.c:433
 #, c-format
@@ -9250,7 +9476,9 @@ msgstr "umount: bị lẫn lộn khi phân tích mtab"
 #: mount/umount.c:470
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
-msgstr "umount: không thể tháo gắn kết %s — %s được gắn kết ở trên nó ở cùng một điểm."
+msgstr ""
+"umount: không thể tháo gắn kết %s — %s được gắn kết ở trên nó ở cùng một "
+"điểm."
 
 #: mount/umount.c:477
 #, c-format
@@ -9318,7 +9546,8 @@ msgstr ""
 "chrt — thao tác các thuộc tính thời gian thật của một tiến trình.\n"
 "\n"
 "Đặt chính sách:\n"
-"  chrt [các_tùy_chọn] <chính_sách> <ưu_tiên> {<pid> | <lệnh> [<đối_số> ...]}\n"
+"  chrt [các_tùy_chọn] <chính_sách> <ưu_tiên> {<pid> | <lệnh> "
+"[<đối_số> ...]}\n"
 "\n"
 "Lấy chính sách:\n"
 "  chrt [các_tùy_chọn] {<pid> | <lệnh> [<đối_số> ...]}\n"
@@ -9349,49 +9578,49 @@ msgstr "lỗi lấy chính sách của PID %d"
 msgid "pid %d's %s scheduling policy: "
 msgstr "chính sách định thời %2$s của PID %1$d: "
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, c-format
 msgid "unknown\n"
 msgstr "không rõ\n"
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr "lỗi lấy các thuộc tính về PID %d"
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr "mức ưu tiên định thời %2$s của PID %1$d: %3$d\n"
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr "SCHED_%s ưu tiên tiểu/đa\t: %d/%d\n"
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "SCHED_%s không được hỗ trợ ?\n"
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 msgid "failed to parse pid"
 msgstr "lỗi phân tích PID"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr "hiện thời"
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 msgid "failed to parse priority"
 msgstr "lỗi phân tích mức ưu tiên"
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "lỗi đặt chính sách của PID %d"
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, c-format
 msgid "failed to execute %s"
 msgstr "lỗi thực hiện %s"
@@ -9430,7 +9659,8 @@ msgstr ""
 "  ionoce [ các_tùy_chọn ] <lệnh> [<đối_số> ...]\n"
 "\n"
 "Tuỳ chọn:\n"
-"  -n <dữ_liệu_hạng>      dữ liệu hạng (0-7, nhỏ hơn thì mức ưu tiên cao hơn)\n"
+"  -n <dữ_liệu_hạng>      dữ liệu hạng (0-7, nhỏ hơn thì mức ưu tiên cao "
+"hơn)\n"
 "  -c <hạng>          hạng định thời\n"
 "                      \t\t1\tthời gian thật\n"
 "\t\t\t\t2\tsự cố gắng tốt nhất\n"
@@ -9479,10 +9709,12 @@ msgstr ""
 #: sys-utils/cytune.c:125
 #, c-format
 msgid ""
-"File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\n"
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
+"in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Tập tin %s, Giá trị ngưỡng %lu, và giá trị thời gian chờ %lu, Số ký tự lớn nhất trong fifo là %d,\n"
+"Tập tin %s, Giá trị ngưỡng %lu, và giá trị thời gian chờ %lu, Số ký tự lớn "
+"nhất trong fifo là %d,\n"
 "và tốc độ truyền tải lớn nhất tính theo ký tự/giây là %f\n"
 
 #: sys-utils/cytune.c:189
@@ -9512,8 +9744,12 @@ msgstr "Giá trị thời gian mặc định không đúng: %s\n"
 
 #: sys-utils/cytune.c:238
 #, c-format
-msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
-msgstr "Sử dụng: %s [-q [-i khoảngthờigian]] ([-s giátrị]|[-S giátrị]) ([-t giátrị]|[-T giátrị]) [-g|-G] tậptin [tậptin...]\n"
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+"Sử dụng: %s [-q [-i khoảngthờigian]] ([-s giátrị]|[-S giátrị]) ([-t giátrị]|"
+"[-T giátrị]) [-g|-G] tậptin [tậptin...]\n"
 
 #: sys-utils/cytune.c:250 sys-utils/cytune.c:269 sys-utils/cytune.c:289
 #: sys-utils/cytune.c:339
@@ -9566,8 +9802,11 @@ msgstr "Không CYGETMON được trên %s: %s\n"
 
 #: sys-utils/cytune.c:418
 #, c-format
-msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ngắt, %lu/%lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu bây giờ\n"
+msgid ""
+"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ngắt, %lu/%lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu "
+"bây giờ\n"
 
 #: sys-utils/cytune.c:424
 #, c-format
@@ -9576,8 +9815,11 @@ msgstr "   %f int/giây; %f rec, %f gửi (kýtự/giây)\n"
 
 #: sys-utils/cytune.c:429
 #, c-format
-msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ngắt, %lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu bây giờ\n"
+msgid ""
+"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ngắt, %lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu bây "
+"giờ\n"
 
 #: sys-utils/cytune.c:435
 #, c-format
@@ -9808,8 +10050,11 @@ msgstr "\t%s -h để xem trợ giúp.\n"
 
 #: sys-utils/ipcs.c:128
 #, c-format
-msgid "%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s cung cấp thông tin về phương tiện ipc cho những gì người dùng có truy cập đọc.\n"
+msgid ""
+"%s provides information on ipc facilities for which you have read access.\n"
+msgstr ""
+"%s cung cấp thông tin về phương tiện ipc cho những gì người dùng có truy cập "
+"đọc.\n"
 
 #: sys-utils/ipcs.c:130
 #, c-format
@@ -10411,7 +10656,7 @@ msgstr "phần"
 msgid "full"
 msgstr "đầy"
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, c-format
 msgid "error: %s"
 msgstr "lỗi: %s"
@@ -10429,15 +10674,15 @@ msgstr "lỗi: strdup không thành công"
 msgid "error: uname failed"
 msgstr "lỗi: uname không thành công"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 msgid "error: malloc failed"
 msgstr "lỗi: malloc không thành công"
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr "lỗi: hệ thống tập tin « /sys » không thể truy cập được"
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10451,65 +10696,65 @@ msgstr ""
 "# bắt đầu từ số không.\n"
 "# CPU,Lõi,Ổ_cắm,Nút"
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr "Mạch mỗi lõi:"
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr "Lõi mỗi ổ cắm:"
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr "Ổ cắm CPU:"
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr "Nút NUMA:"
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr "Mã số nhà sản xuất:"
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr "Nhóm CPU:"
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr "Mô hình:"
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr "Làm bước:"
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr "CPU MHz:"
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 msgid "Virtualization:"
 msgstr "Mô phỏng:"
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr "Nhà sản xuất bộ mô phòng đồng thời:"
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr "Kiểu mô phỏng:"
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr "Vùng nhớ tạm %s:"
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Sử dụng: %s [tùy_chọn]\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10520,10 +10765,11 @@ msgstr ""
 "Trình bổ trợ thông tin kiến trúc CPU\n"
 "\n"
 "  -h, --help     trợ giúp\n"
-"  -p, --parse    in ra theo định dạng có thể phân tích thay cho định dạng in được\n"
+"  -p, --parse    in ra theo định dạng có thể phân tích thay cho định dạng in "
+"được\n"
 "  -s, --sysroot  dùng thư mục làm gốc hệ thống mới\n"
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, c-format
 msgid "error: change working directory to %s."
 msgstr "lỗi: chuyển đổi thư mục làm việc sang %s."
@@ -10533,8 +10779,11 @@ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr "sử dụng: rdev [ -rv ] [ -o BÙ ] [ ẢNH [ GIÁ_TRỊ [ BÙ ] ] ]"
 
 #: sys-utils/rdev.c:78
-msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (hoặc rdev /linux, v.v...) hiển thị thiết bị ROOT (gốc) hiện thời"
+msgid ""
+"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr ""
+"  rdev /dev/fd0  (hoặc rdev /linux, v.v...) hiển thị thiết bị ROOT (gốc) "
+"hiện thời"
 
 #: sys-utils/rdev.c:79
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -10542,7 +10791,9 @@ msgstr "  rdev /dev/fd0 /dev/hda2         đặt ROOT (gốc) thành /dev/hda2"
 
 #: sys-utils/rdev.c:80
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1              đặt ROOTFLAGS [các cờ gốc] (trạng thái chỉ đọc)"
+msgstr ""
+"  rdev -R /dev/fd0 1              đặt ROOTFLAGS [các cờ gốc] (trạng thái chỉ "
+"đọc)"
 
 #: sys-utils/rdev.c:81
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
@@ -10550,7 +10801,9 @@ msgstr "  rdev -r /dev/fd0 627            đặt kích cỡ RAMDISK (đĩa RAM)"
 
 #: sys-utils/rdev.c:82
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              đặt chế độ VIDEOMODE (chế độ ảnh động) khởi động"
+msgstr ""
+"  rdev -v /dev/fd0 1              đặt chế độ VIDEOMODE (chế độ ảnh động) "
+"khởi động"
 
 #: sys-utils/rdev.c:83
 msgid "  rdev -o N ...                   use the byte offset N"
@@ -10569,8 +10822,11 @@ msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     giống như rdev -v"
 
 #: sys-utils/rdev.c:87
-msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr "Chú ý: chế độ ảnh động là: -3=Hỏi, -2=Mở rộng, -1=VGA chuẩn, 1=phím1, 2=phím2,..."
+msgid ""
+"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr ""
+"Chú ý: chế độ ảnh động là: -3=Hỏi, -2=Mở rộng, -1=VGA chuẩn, 1=phím1, "
+"2=phím2,..."
 
 #: sys-utils/rdev.c:88
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
@@ -10624,7 +10880,8 @@ msgstr "readprofile: lỗi ghi %s: %s\n"
 #: sys-utils/readprofile.c:268
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
-msgstr "Giả sử thứ tự byte đảo lộn. Dùng « -n » để ép buộc theo thứ tự byte sở hữu.\n"
+msgstr ""
+"Giả sử thứ tự byte đảo lộn. Dùng « -n » để ép buộc theo thứ tự byte sở hữu.\n"
 
 #: sys-utils/readprofile.c:284
 #, c-format
@@ -10844,7 +11101,8 @@ msgstr ""
 msgid ""
 " -h, --help               displays this help text\n"
 " -v, --verbose            says what options are being switched on\n"
-" -R, --addr-no-randomize  disables randomization of the virtual address space\n"
+" -R, --addr-no-randomize  disables randomization of the virtual address "
+"space\n"
 " -F, --fdpic-funcptrs     makes function pointers point to descriptors\n"
 " -Z, --mmap-page-zero     turns on MMAP_PAGE_ZERO\n"
 " -L, --addr-compat-layout changes the way virtual memory is allocated\n"
@@ -10853,7 +11111,8 @@ msgid ""
 " -I, --short-inode        turns on SHORT_INODE\n"
 " -S, --whole-seconds      turns on WHOLE_SECONDS\n"
 " -T, --sticky-timeouts    turns on STICKY_TIMEOUTS\n"
-" -3, --3gb                limits the used address space to a maximum of 3 GB\n"
+" -3, --3gb                limits the used address space to a maximum of 3 "
+"GB\n"
 "     --4gb                ignored (for backward compatibility only)\n"
 msgstr ""
 " -h, --help              \t\thiển thị trợ giúp này\n"
@@ -10864,7 +11123,8 @@ msgstr ""
 " -Z, --mmap-page-zero\tbật MMAP_PAGE_ZERO\n"
 " -L, --addr-compat-layout\tthay đổi cách cấp phát bộ nhớ ảo\n"
 " -X, --read-implies-exec  \tbật READ_IMPLIES_EXEC (đọc ngụ ý thực hiện)\n"
-" -B, --32bit              \t\tbật ADDR_LIMIT_32BIT (giới hạn địa chỉ 32-bit)\n"
+" -B, --32bit              \t\tbật ADDR_LIMIT_32BIT (giới hạn địa chỉ 32-"
+"bit)\n"
 " -I, --short-inode        \t\tbật SHORT_INODE (nút thông tin ngắn)\n"
 " -S, --whole-seconds      \tbật WHOLE_SECONDS (nguyên giây)\n"
 " -T, --sticky-timeouts    \tbật STICKY_TIMEOUTS (thời hạn dính)\n"
@@ -11031,8 +11291,11 @@ msgstr "hexdump: giá trị nhảy qua (skip) xấu.\n"
 
 #: text-utils/hexsyntax.c:131
 #, c-format
-msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr "hexdump: [-bcCdovx] [-e fmt] [-f tậptin_fmt] [-n chiềudài] [-s nhảyqua] [tậptin ...]\n"
+msgid ""
+"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+"hexdump: [-bcCdovx] [-e fmt] [-f tậptin_fmt] [-n chiềudài] [-s nhảyqua] "
+"[tậptin ...]\n"
 
 #: text-utils/more.c:256
 #, c-format
@@ -11117,11 +11380,13 @@ msgstr ""
 #: text-utils/more.c:1294
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in "
+"brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"Có thể thêm một tham số số nguyên vào trước hầu hết các câu lệnh.  Mặc định đặttrong dấu ngoặc đơn.\n"
+"Có thể thêm một tham số số nguyên vào trước hầu hết các câu lệnh.  Mặc định "
+"đặttrong dấu ngoặc đơn.\n"
 "Dấu sao (*) cho biết tham số sẽ thành mặc định mới.\n"
 
 #: text-utils/more.c:1301
@@ -11146,10 +11411,13 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
-"<space>                 Hiện k dòng văn bản tiếp theo [kích cỡ màn hình hiện thời]\n"
-"z                       Hiển thị k dòng văn bản tiếp theo [kích cỡ màn hình hiện thời]*\n"
+"<space>                 Hiện k dòng văn bản tiếp theo [kích cỡ màn hình hiện "
+"thời]\n"
+"z                       Hiển thị k dòng văn bản tiếp theo [kích cỡ màn hình "
+"hiện thời]*\n"
 "<return>                Hiển thị k dòng văn bản tiếp theo [1]*\n"
-"d hoặc ctrl-D             Cuộn k dòng [kích cỡ cuộn hiện thời, ban đầu là 11]*\n"
+"d hoặc ctrl-D             Cuộn k dòng [kích cỡ cuộn hiện thời, ban đầu là 11]"
+"*\n"
 "q hoặc Q hoặc <interrupt>   Thoát khỏi more\n"
 "s                       Bỏ qua k dòng văn bản [1]\n"
 "f                       Bỏ qua k màn hình văn bản [1]\n"
@@ -11157,7 +11425,8 @@ msgstr ""
 "'                       Đi tới nơi trước khi bắt đầu tìm kiếm\n"
 "=                       Hiển thị số thứ tự dòng hiện thời\n"
 "/<biểu thức chính quy>   Tìm kiếm lần xuất hiện thứ k của biểu thức [1]\n"
-"n                       Tìm kiếm lần xuất hiện thứ k của biểu thức cuối cùng [1]\n"
+"n                       Tìm kiếm lần xuất hiện thứ k của biểu thức cuối cùng "
+"[1]\n"
 "!<cmd> hoặc :!<cmd>       Thực hiện <cmd> trong một shell con\n"
 "v                       Chạy /usr/bin/vi tại dòng hiện thời\n"
 "ctrl-L                  Vẽ lại màn hình\n"
@@ -11303,7 +11572,8 @@ msgid ""
 "  n                       go to next file\n"
 "\n"
 "Many commands accept preceding numbers, for example:\n"
-"+1<newline> (next page); -1<newline> (previous page); 1<newline> (first page).\n"
+"+1<newline> (next page); -1<newline> (previous page); 1<newline> (first "
+"page).\n"
 "\n"
 "See pg(1) for more information.\n"
 "-------------------------------------------------------\n"
@@ -11318,7 +11588,8 @@ msgstr ""
 "  l                       dòng kế tiếp\n"
 "  $                       trang cuối cùng\n"
 "  /biểu thức chính quy/                 quết tới tìm chuỗi này\n"
-"  ?biểu thức chính quy? hay ^biểu thức chính quy^    quét ngược tìm chuỗi này\n"
+"  ?biểu thức chính quy? hay ^biểu thức chính quy^    quét ngược tìm chuỗi "
+"này\n"
 "  . hay ^L                 vẽ lại màn hình\n"
 "  w hay z                  đặt kích cỡ trang và đi tới trang kế tiếp\n"
 "  s tên_tập_tin              lưu tập tin hiện thời vào tên tập tin này\n"
@@ -11327,7 +11598,8 @@ msgstr ""
 "  n                       đi tới tập tin kế tiếp\n"
 "\n"
 "Nhiều câu lệnh cũng chấp nhận số đi trước, v.d.\n"
-"+1<dòng_mới> (trang kế tiếp); -1<dòng_mới> (trang trước); 1<dòng_mới> (trang đầu).\n"
+"+1<dòng_mới> (trang kế tiếp); -1<dòng_mới> (trang trước); 1<dòng_mới> (trang "
+"đầu).\n"
 "\n"
 "Xem pg(1) để tìm thêm thông tin.\n"
 "-------------------------------------------------------\n"
@@ -11338,8 +11610,11 @@ msgstr "Không đủ bộ nhớ\n"
 
 #: text-utils/pg.c:236
 #, c-format
-msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
-msgstr "%s: Sử dụng: %s [-số] [-p chuỗi] [-cefnrs] [+dòng] [+/pattern/] [các_tậptin]\n"
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+"%s: Sử dụng: %s [-số] [-p chuỗi] [-cefnrs] [+dòng] [+/pattern/] "
+"[các_tậptin]\n"
 
 #: text-utils/pg.c:245
 #, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4d15d7eb..6f924e44 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng-2.14.1-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-04-29 15:34+0200\n"
+"POT-Creation-Date: 2009-05-27 21:39+0200\n"
 "PO-Revision-Date: 2008-08-23 23:20+0800\n"
 "Last-Translator: Ray Wang <wanglei1123@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -7199,25 +7199,25 @@ msgstr ""
 msgid "%s: can't read temporary file.\n"
 msgstr ""
 
-#: misc-utils/cal.c:355 misc-utils/cal.c:367
+#: misc-utils/cal.c:358 misc-utils/cal.c:370
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr ""
 
-#: misc-utils/cal.c:359
+#: misc-utils/cal.c:362
 msgid "illegal month value: use 1-12"
 msgstr ""
 
-#: misc-utils/cal.c:363
+#: misc-utils/cal.c:366
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#: misc-utils/cal.c:457
+#: misc-utils/cal.c:460
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:848
+#: misc-utils/cal.c:851
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr ""
@@ -8809,50 +8809,50 @@ msgstr ""
 msgid "pid %d's %s scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:108
+#: schedutils/chrt.c:112
 #, c-format
 msgid "unknown\n"
 msgstr ""
 
-#: schedutils/chrt.c:112
+#: schedutils/chrt.c:116
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:114
+#: schedutils/chrt.c:118
 #, c-format
 msgid "pid %d's %s scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:130
+#: schedutils/chrt.c:147
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:133
+#: schedutils/chrt.c:150
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:185
+#: schedutils/chrt.c:206
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "不能读 inodes"
 
-#: schedutils/chrt.c:207
+#: schedutils/chrt.c:228
 msgid "current"
 msgstr ""
 
-#: schedutils/chrt.c:215
+#: schedutils/chrt.c:236
 msgid "failed to parse priority"
 msgstr ""
 
-#: schedutils/chrt.c:221
+#: schedutils/chrt.c:242
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:230
+#: schedutils/chrt.c:251
 #, c-format
 msgid "failed to execute %s"
 msgstr ""
@@ -9819,7 +9819,7 @@ msgstr ""
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:431
+#: sys-utils/lscpu.c:129 sys-utils/lscpu.c:152 sys-utils/lscpu.c:441
 #, c-format
 msgid "error: %s"
 msgstr ""
@@ -9838,15 +9838,15 @@ msgstr ""
 msgid "error: uname failed"
 msgstr "查找失败"
 
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:491
 msgid "error: malloc failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:496
+#: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
 msgstr ""
 
-#: sys-utils/lscpu.c:514
+#: sys-utils/lscpu.c:524
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -9855,65 +9855,65 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:580
+#: sys-utils/lscpu.c:590
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:581
+#: sys-utils/lscpu.c:591
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:582
+#: sys-utils/lscpu.c:592
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:586
+#: sys-utils/lscpu.c:596
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:588
+#: sys-utils/lscpu.c:598
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:590
+#: sys-utils/lscpu.c:600
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:592
+#: sys-utils/lscpu.c:602
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:594
+#: sys-utils/lscpu.c:604
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:606
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:599 sys-utils/lscpu.c:601
+#: sys-utils/lscpu.c:609 sys-utils/lscpu.c:611
 msgid "Virtualization:"
 msgstr ""
 
-#: sys-utils/lscpu.c:604
+#: sys-utils/lscpu.c:614
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:615
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:613
+#: sys-utils/lscpu.c:623
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:621
+#: sys-utils/lscpu.c:631
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: sys-utils/lscpu.c:624
+#: sys-utils/lscpu.c:634
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -9922,7 +9922,7 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:673
+#: sys-utils/lscpu.c:683
 #, c-format
 msgid "error: change working directory to %s."
 msgstr ""
-- 
cgit v1.2.3


From 62a6a3f66fa54919d649235cc7d38b948d729959 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 21:44:31 +0200
Subject: docs: update AUTHORS file

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 AUTHORS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 39bfb2a2..430b3747 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -49,6 +49,7 @@ CONTRIBUTORS:
       Bernhard Walle <bwalle@suse.de>
       Cai Qian <qcai@redhat.com>
       Christophe Blaess <Christophe@Blaess.fr>
+      Chris Webb <chris@arachsys.com>
       Claus Hindsgaul <claus_h@image.dk>
       Cliff Wickman <cpw@sgi.com>
       Clytie Siddall <clytie@riverland.net.au>
@@ -143,6 +144,7 @@ CONTRIBUTORS:
       Sven Jost <sven.jost@googlemail.com>
       Theodore Ts'o <tytso@mit.edu>
       Tilman Schmidt <tilman@imap.cc>
+      Tom Prince <tom.prince@ualberta.net>
       Valerie Henson <val_henson@linux.intel.com>
       Vincent Deffontaines <vincent@gryzor.com>
       Volker Schatz <oss@volkerschatz.com>
-- 
cgit v1.2.3


From 1d243fa472206c18a9e6fadb1701e20f5dede718 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 21:50:19 +0200
Subject: docs: add v2.15.1 ReleaseNotes

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 docs/v2.15.1-ReleaseNotes | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 docs/v2.15.1-ReleaseNotes

diff --git a/docs/v2.15.1-ReleaseNotes b/docs/v2.15.1-ReleaseNotes
new file mode 100644
index 00000000..b879d302
--- /dev/null
+++ b/docs/v2.15.1-ReleaseNotes
@@ -0,0 +1,47 @@
+Util-linux-ng 2.15.1 Release Notes
+==================================
+
+Changes since v2.15
+-------------------
+
+ For more details see ChangeLog files at:
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/
+
+build-sys:
+   - add UTIL_{SET,RESTORE}_FLAGS  [Karel Zak]
+   - fix "make -C" bug  [Karel Zak]
+   - fix blkid detection in configure.ac  [Karel Zak]
+   - fix blkid.h include for old e2fsprogs  [Karel Zak]
+cal:
+   - Highlight today even when month or year specified  [Rajeev V. Pillai]
+   - uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.  [Tom Prince]
+chrt:
+   - don't assume SCHED_BATCH and SCHED_IDLE exist  [Aurelien Jarno]
+docs:
+   - update AUTHORS file  [Karel Zak]
+fdisk:
+   - (and cfdisk) fix to be consistent about maximum heads  [Chris Webb]
+libblkid:
+   - fix reiserfs name  [Karel Zak]
+   - update man page  [Karel Zak]
+   - blkid_do_safeprobe() has to be tolerant to RAIDs  [Karel Zak]
+   - cleanup debug messages and return codes in blkid_do_probe()  [Karel Zak]
+   - fix "hangs forever with partition type mdraid"  [Karel Zak]
+   - make libuuid optional  [Karel Zak]
+losetup:
+   - handle symlinks in /dev/loop/  [Mike Frysinger]
+lscpu:
+   - fix cpuid code on x86/PIC  [Mike Frysinger]
+mount:
+   - fix undefined reference to `security_get_initial_context'  [Karel Zak]
+po:
+   - merge changes  [Karel Zak]
+   - update vi.po (from translationproject.org)  [Clytie Siddall]
+tests:
+   - add mdraid libblkid test  [Karel Zak]
+   - don't run some mount tests for non-root users  [Karel Zak]
+   - fix reiserfs test  [Karel Zak]
+   - fix script that creates lscpu dumps  [Karel Zak]
+   - move lscpu /proc and /sys dumps to tarballs  [Karel Zak]
+   - remove broken Xen dumps for lscpu  [Karel Zak]
+
-- 
cgit v1.2.3


From e0729510fd24107a930a665d703df583703e3b56 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 22:20:11 +0200
Subject: docs: add missing commands/projects to AUTHORS file

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 AUTHORS | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 430b3747..fdd93bb3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,14 +17,17 @@ AUTHORS (merged projects & commands):
 
       flock:           H. Peter Anvin <hpa@zytor.com>
       getopt:          Frodo Looijaard <frodol@dds.nl>
-      schedutils:      Robert Love <rlove@rlove.org>
-      simpleinit:      Richard Gooch <rgooch@atnf.csiro.au>
       hwclock:         Bryan Henderson <bryanh@giraffe-data.com>
-      setarch:         Elliot Lee <sopwith@redhat.com>
-                       Jindrich Novy <jnovy@redhat.com>
+      ipcmk:           Hayden James <hayden.james@gmail.com>
+      ldattach:        Tilman Schmidt <tilman@imap.cc>
+      libblkid:        Theodore Ts'o <tytso@mit.edu>
+      lscpu:           Cai Qian <qcai@redhat.com>
       rtcwake:         David Brownell <david-b@pacbell.net>
                        Bernhard Walle <bwalle@suse.de>
-      ldattach:        Tilman Schmidt <tilman@imap.cc>
+      schedutils:      Robert Love <rlove@rlove.org>
+      setarch:         Elliot Lee <sopwith@redhat.com>
+                       Jindrich Novy <jnovy@redhat.com>
+      simpleinit:      Richard Gooch <rgooch@atnf.csiro.au>
 
 
 CONTRIBUTORS:
-- 
cgit v1.2.3


From 083e23ba81e25c71f433befc68d3fa5e71543de4 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 May 2009 22:23:08 +0200
Subject: build-sys: release++ (v2.15.1-rc1)

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 NEWS         | 4 ++++
 configure.ac | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 90bb65a6..baebb7c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+util-linux-ng 2.15.1-rc1: May 27 2009
+* see docs/v2.15.1-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-rc1-ChangeLog
+
 util-linux-ng 2.15: May 5 2009
 * see docs/v2.15-ReleaseNotes or complete changelog at
   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-ChangeLog
diff --git a/configure.ac b/configure.ac
index ecf96c82..97cda57b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(util-linux-ng, 2.15, kzak@redhat.com)
+AC_INIT(util-linux-ng, 2.15.1-rc1, kzak@redhat.com)
 
 AC_PREREQ(2.60)
 
-- 
cgit v1.2.3