27 files changed, 60304 insertions, 54730 deletions
diff --git a/po/ca.po b/po/ca.po
index 731a2052b..334c62018 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: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2016-04-12 12:17+0200\n"
+"POT-Creation-Date: 2016-09-06 11:16+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"
@@ -32,40 +32,40 @@ msgid "Tell the kernel about the existence of a specified partition.\n"
 msgstr ""
 
 #: disk-utils/addpart.c:56 disk-utils/blockdev.c:276 disk-utils/blockdev.c:420
-#: disk-utils/blockdev.c:446 disk-utils/cfdisk.c:2627 disk-utils/delpart.c:57
-#: disk-utils/fdformat.c:227 disk-utils/fdisk.c:710 disk-utils/fdisk.c:970
+#: disk-utils/blockdev.c:446 disk-utils/cfdisk.c:2617 disk-utils/delpart.c:57
+#: disk-utils/fdformat.c:227 disk-utils/fdisk.c:718 disk-utils/fdisk.c:990
 #: disk-utils/fdisk-list.c:299 disk-utils/fdisk-list.c:339
 #: disk-utils/fdisk-list.c:358 disk-utils/fsck.c:1448
-#: disk-utils/fsck.cramfs.c:149 disk-utils/fsck.cramfs.c:506
+#: disk-utils/fsck.cramfs.c:149 disk-utils/fsck.cramfs.c:504
 #: disk-utils/isosize.c:134 disk-utils/mkfs.bfs.c:189
-#: disk-utils/mkfs.cramfs.c:164 disk-utils/mkfs.cramfs.c:655
-#: disk-utils/mkfs.cramfs.c:782 disk-utils/mkfs.minix.c:823
+#: disk-utils/mkfs.cramfs.c:167 disk-utils/mkfs.cramfs.c:655
+#: disk-utils/mkfs.cramfs.c:782 disk-utils/mkfs.minix.c:819
 #: disk-utils/mkswap.c:215 disk-utils/mkswap.c:244 disk-utils/partx.c:994
-#: disk-utils/resizepart.c:101 disk-utils/sfdisk.c:630 disk-utils/sfdisk.c:686
-#: disk-utils/sfdisk.c:740 disk-utils/sfdisk.c:799 disk-utils/sfdisk.c:863
-#: disk-utils/sfdisk.c:904 disk-utils/sfdisk.c:934 disk-utils/sfdisk.c:968
-#: disk-utils/sfdisk.c:1466 disk-utils/swaplabel.c:60 libfdisk/src/bsd.c:641
-#: lib/path.c:70 lib/path.c:82 login-utils/islocal.c:87 login-utils/last.c:653
-#: login-utils/sulogin.c:480 login-utils/sulogin.c:517
-#: login-utils/utmpdump.c:126 login-utils/utmpdump.c:348
-#: login-utils/utmpdump.c:370 login-utils/vipw.c:258 login-utils/vipw.c:276
-#: misc-utils/findmnt.c:1121 misc-utils/logger.c:1180 misc-utils/mcookie.c:115
+#: disk-utils/resizepart.c:101 disk-utils/sfdisk.c:634 disk-utils/sfdisk.c:690
+#: disk-utils/sfdisk.c:744 disk-utils/sfdisk.c:803 disk-utils/sfdisk.c:867
+#: disk-utils/sfdisk.c:908 disk-utils/sfdisk.c:938 disk-utils/sfdisk.c:972
+#: disk-utils/sfdisk.c:1521 disk-utils/swaplabel.c:60 libfdisk/src/bsd.c:641
+#: lib/path.c:70 lib/path.c:82 login-utils/islocal.c:87 login-utils/last.c:672
+#: login-utils/sulogin.c:446 login-utils/sulogin.c:483
+#: login-utils/utmpdump.c:136 login-utils/utmpdump.c:359
+#: login-utils/utmpdump.c:381 login-utils/vipw.c:258 login-utils/vipw.c:276
+#: misc-utils/findmnt.c:1121 misc-utils/logger.c:1177 misc-utils/mcookie.c:115
 #: misc-utils/uuidd.c:207 sys-utils/blkdiscard.c:183 sys-utils/dmesg.c:522
 #: sys-utils/eject.c:500 sys-utils/eject.c:700 sys-utils/fallocate.c:374
-#: sys-utils/fsfreeze.c:128 sys-utils/fstrim.c:72 sys-utils/hwclock.c:280
+#: sys-utils/fsfreeze.c:128 sys-utils/fstrim.c:72 sys-utils/hwclock.c:282
 #: sys-utils/hwclock-cmos.c:638 sys-utils/hwclock-rtc.c:162
 #: sys-utils/hwclock-rtc.c:256 sys-utils/hwclock-rtc.c:401
 #: sys-utils/hwclock-rtc.c:422 sys-utils/hwclock-rtc.c:469
-#: sys-utils/ldattach.c:388 sys-utils/nsenter.c:126 sys-utils/rtcwake.c:135
-#: sys-utils/rtcwake.c:269 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529
+#: sys-utils/ldattach.c:388 sys-utils/nsenter.c:128 sys-utils/rtcwake.c:136
+#: sys-utils/rtcwake.c:270 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529
 #: sys-utils/setpriv.c:552 sys-utils/swapon.c:371 sys-utils/swapon.c:514
 #: sys-utils/switch_root.c:163 sys-utils/unshare.c:106 sys-utils/unshare.c:121
-#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2615
-#: term-utils/agetty.c:2639 term-utils/mesg.c:127 term-utils/script.c:420
-#: term-utils/script.c:426 term-utils/script.c:428 term-utils/script.c:516
-#: term-utils/scriptreplay.c:206 term-utils/scriptreplay.c:209
-#: term-utils/wall.c:331 text-utils/colcrt.c:275 text-utils/more.c:518
-#: text-utils/rev.c:142 text-utils/tailf.c:67 text-utils/tailf.c:101
+#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2618
+#: term-utils/mesg.c:127 term-utils/script.c:425 term-utils/script.c:431
+#: term-utils/script.c:433 term-utils/script.c:522
+#: term-utils/scriptreplay.c:197 term-utils/scriptreplay.c:200
+#: term-utils/wall.c:331 text-utils/colcrt.c:282 text-utils/more.c:513
+#: text-utils/rev.c:142 text-utils/tailf.c:68 text-utils/tailf.c:100
 #: text-utils/ul.c:225
 #, c-format
 msgid "cannot open %s"
@@ -240,474 +240,475 @@ msgstr "torna a llegir la taula de particions"
 msgid "RO    RA   SSZ   BSZ   StartSec            Size   Device\n"
 msgstr "RO    RA   SSZ   BSZ   SectInici    Mida    Dispositiu\n"
 
-#: disk-utils/cfdisk.c:180
+#: disk-utils/cfdisk.c:179
 msgid "Bootable"
 msgstr "Arrencable"
 
-#: disk-utils/cfdisk.c:180
+#: disk-utils/cfdisk.c:179
 msgid "Toggle bootable flag of the current partition"
 msgstr "Commuta el senyalador d'arrencada de la partició actual"
 
-#: disk-utils/cfdisk.c:181
+#: disk-utils/cfdisk.c:180
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: disk-utils/cfdisk.c:181
+#: disk-utils/cfdisk.c:180
 msgid "Delete the current partition"
 msgstr "Suprimeix la partició actual"
 
-#: disk-utils/cfdisk.c:182
+#: disk-utils/cfdisk.c:181
 msgid "New"
 msgstr "Nova"
 
-#: disk-utils/cfdisk.c:182
+#: disk-utils/cfdisk.c:181
 msgid "Create new partition from free space"
 msgstr "Crea una nova partició des de l'espai lliure"
 
-#: disk-utils/cfdisk.c:183
+#: disk-utils/cfdisk.c:182
 msgid "Quit"
 msgstr "Surt"
 
-#: disk-utils/cfdisk.c:183
-msgid "Quit program without writing partition table"
+#: disk-utils/cfdisk.c:182
+#, fuzzy
+msgid "Quit program without writing changes"
 msgstr "Surt del programa sense escriure la taula de particions"
 
-#: disk-utils/cfdisk.c:184 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1020
-#: libfdisk/src/dos.c:2308 libfdisk/src/gpt.c:2776 libfdisk/src/sgi.c:1161
+#: disk-utils/cfdisk.c:183 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1020
+#: libfdisk/src/dos.c:2306 libfdisk/src/gpt.c:2893 libfdisk/src/sgi.c:1160
 #: libfdisk/src/sun.c:1116
 msgid "Type"
 msgstr "Tipus"
 
-#: disk-utils/cfdisk.c:184
+#: disk-utils/cfdisk.c:183
 #, fuzzy
 msgid "Change the partition type"
 msgstr "   t   canvia l'identificador del sistema d'una partició"
 
-#: disk-utils/cfdisk.c:185
+#: disk-utils/cfdisk.c:184
 msgid "Help"
 msgstr "Ajuda"
 
-#: disk-utils/cfdisk.c:185
+#: disk-utils/cfdisk.c:184
 msgid "Print help screen"
 msgstr "Mostra la pantalla d'ajuda"
 
-#: disk-utils/cfdisk.c:186
+#: disk-utils/cfdisk.c:185
 msgid "Sort"
 msgstr ""
 
-#: disk-utils/cfdisk.c:186
+#: disk-utils/cfdisk.c:185
 #, fuzzy
 msgid "Fix partitions order"
 msgstr "   f   arregla l'ordre de les particions"
 
-#: disk-utils/cfdisk.c:187
+#: disk-utils/cfdisk.c:186
 msgid "Write"
 msgstr "Escriu"
 
-#: disk-utils/cfdisk.c:187
+#: disk-utils/cfdisk.c:186
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Escriu la taula de particions al disc (això pot destruir les dades)"
 
-#: disk-utils/cfdisk.c:188
+#: disk-utils/cfdisk.c:187
 msgid "Dump"
 msgstr ""
 
-#: disk-utils/cfdisk.c:188
+#: disk-utils/cfdisk.c:187
 #, fuzzy
 msgid "Dump partition table to sfdisk compatible script file"
 msgstr "Imprimeix la taula de particions a la pantalla o en un fitxer"
 
-#: disk-utils/cfdisk.c:617 disk-utils/fdisk.c:412
+#: disk-utils/cfdisk.c:620 disk-utils/fdisk.c:415
 #, c-format
 msgid "internal error: unsupported dialog type %d"
 msgstr ""
 
-#: disk-utils/cfdisk.c:1247
+#: disk-utils/cfdisk.c:1250
 #, fuzzy, c-format
 msgid "%s (mounted)"
 msgstr "umount: %s: no s'ha trobat"
 
-#: disk-utils/cfdisk.c:1267
+#: disk-utils/cfdisk.c:1270
 #, fuzzy
 msgid "Partition name:"
 msgstr "Nombre de partició"
 
-#: disk-utils/cfdisk.c:1272
+#: disk-utils/cfdisk.c:1275
 #, fuzzy
 msgid "Partition UUID:"
 msgstr ""
 "\n"
 "%d particions:\n"
 
-#: disk-utils/cfdisk.c:1282
+#: disk-utils/cfdisk.c:1285
 #, fuzzy
 msgid "Partition type:"
 msgstr "Nombre de partició"
 
-#: disk-utils/cfdisk.c:1289
+#: disk-utils/cfdisk.c:1292
 msgid "Attributes:"
 msgstr ""
 
-#: disk-utils/cfdisk.c:1332
+#: disk-utils/cfdisk.c:1316
 #, fuzzy
-msgid "Filesystem:"
+msgid "Filesystem UUID:"
 msgstr "Introduïu el tipus del sistema de fitxers: "
 
-#: disk-utils/cfdisk.c:1334
+#: disk-utils/cfdisk.c:1321
 #, fuzzy
-msgid "Filesystem label:"
+msgid "Filesystem LABEL:"
 msgstr "Introduïu el tipus del sistema de fitxers: "
 
-#: disk-utils/cfdisk.c:1338
+#: disk-utils/cfdisk.c:1325
 #, fuzzy
-msgid "Filesystem UUID:"
+msgid "Filesystem:"
 msgstr "Introduïu el tipus del sistema de fitxers: "
 
-#: disk-utils/cfdisk.c:1350
+#: disk-utils/cfdisk.c:1333
 #, fuzzy
 msgid "Mountpoint:"
 msgstr "%s està muntat.\t "
 
-#: disk-utils/cfdisk.c:1691
+#: disk-utils/cfdisk.c:1673
 #, fuzzy, c-format
 msgid "Disk: %s"
 msgstr "disc: %.*s\n"
 
-#: disk-utils/cfdisk.c:1693
+#: disk-utils/cfdisk.c:1675
 #, fuzzy, c-format
 msgid "Size: %s, %ju bytes, %ju sectors"
 msgstr ""
 "\n"
 "Disc %s: %lu cilindres, %lu capçals, %lu sectors/pista\n"
 
-#: disk-utils/cfdisk.c:1696
+#: disk-utils/cfdisk.c:1678
 #, fuzzy, c-format
 msgid "Label: %s, identifier: %s"
 msgstr "Unitat de disc: %s"
 
-#: disk-utils/cfdisk.c:1699
+#: disk-utils/cfdisk.c:1681
 #, fuzzy, c-format
 msgid "Label: %s"
 msgstr "etiqueta: %.*s\n"
 
-#: disk-utils/cfdisk.c:1852
+#: disk-utils/cfdisk.c:1834
 msgid "May be followed by M for MiB, G for GiB, T for TiB, or S for sectors."
 msgstr ""
 
-#: disk-utils/cfdisk.c:1858
+#: disk-utils/cfdisk.c:1840
 #, fuzzy
 msgid "Please, specify size."
 msgstr "No s'ha especificat l'opció --date.\n"
 
-#: disk-utils/cfdisk.c:1880
+#: disk-utils/cfdisk.c:1862
 #, fuzzy, c-format
 msgid "Minimum size is %ju bytes."
 msgstr "aconsegueix la mida en octets"
 
-#: disk-utils/cfdisk.c:1889
+#: disk-utils/cfdisk.c:1871
 #, fuzzy, c-format
 msgid "Maximum size is %ju bytes."
 msgstr "aconsegueix la mida en octets"
 
-#: disk-utils/cfdisk.c:1896
+#: disk-utils/cfdisk.c:1878
 #, fuzzy
 msgid "Failed to parse size."
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: disk-utils/cfdisk.c:1954
+#: disk-utils/cfdisk.c:1936
 #, fuzzy
 msgid "Select partition type"
 msgstr "S'ha seleccionat la partició %d\n"
 
-#: disk-utils/cfdisk.c:2000 disk-utils/cfdisk.c:2030
+#: disk-utils/cfdisk.c:1982 disk-utils/cfdisk.c:2012
 #, fuzzy
 msgid "Enter script file name: "
 msgstr "%s: no s'ha pogut trobar el dispositiu per a %s\n"
 
-#: disk-utils/cfdisk.c:2001
+#: disk-utils/cfdisk.c:1983
 #, fuzzy
 msgid "The script file will be applied to in-memory partition table."
 msgstr "No podreu escriure la taula de particions.\n"
 
-#: disk-utils/cfdisk.c:2010 disk-utils/cfdisk.c:2052
-#: disk-utils/fdisk-menu.c:464 disk-utils/fdisk-menu.c:502
+#: disk-utils/cfdisk.c:1992 disk-utils/cfdisk.c:2034
+#: disk-utils/fdisk-menu.c:465 disk-utils/fdisk-menu.c:503
 #, fuzzy, c-format
 msgid "Cannot open %s"
 msgstr "No es pot obrir %s\n"
 
-#: disk-utils/cfdisk.c:2012 disk-utils/fdisk-menu.c:466
+#: disk-utils/cfdisk.c:1994 disk-utils/fdisk-menu.c:467
 #, fuzzy, c-format
 msgid "Failed to parse script file %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
-#: disk-utils/cfdisk.c:2014 disk-utils/fdisk-menu.c:468
+#: disk-utils/cfdisk.c:1996 disk-utils/fdisk-menu.c:469
 #, fuzzy, c-format
 msgid "Failed to apply script %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
-#: disk-utils/cfdisk.c:2031
+#: disk-utils/cfdisk.c:2013
 msgid "The current in-memory partition table will be dumped to the file."
 msgstr ""
 
-#: disk-utils/cfdisk.c:2039 disk-utils/fdisk-menu.c:490
+#: disk-utils/cfdisk.c:2021 disk-utils/fdisk-menu.c:491
 #, fuzzy
 msgid "Failed to allocate script handler"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
-#: disk-utils/cfdisk.c:2045
+#: disk-utils/cfdisk.c:2027
 #, fuzzy
 msgid "Failed to read disk layout into script."
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
-#: disk-utils/cfdisk.c:2059
+#: disk-utils/cfdisk.c:2041
 msgid "Disk layout successfully dumped."
 msgstr ""
 
-#: disk-utils/cfdisk.c:2062 disk-utils/fdisk-menu.c:508
+#: disk-utils/cfdisk.c:2044 disk-utils/fdisk-menu.c:509
 #, fuzzy, c-format
 msgid "Failed to write script %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
-#: disk-utils/cfdisk.c:2098
+#: disk-utils/cfdisk.c:2080
 #, fuzzy
 msgid "Select label type"
 msgstr "Tipus no permès\n"
 
-#: disk-utils/cfdisk.c:2101 disk-utils/fdisk.c:993
+#: disk-utils/cfdisk.c:2083 disk-utils/fdisk.c:1013
 #, fuzzy
 msgid "Device does not contain a recognized partition table."
 msgstr "El disc %s no conté una taula de particions vàlida\n"
 
-#: disk-utils/cfdisk.c:2107
+#: disk-utils/cfdisk.c:2089
 msgid "Select a type to create a new label or press 'L' to load script file."
 msgstr ""
 
-#: disk-utils/cfdisk.c:2152
+#: disk-utils/cfdisk.c:2134
 #, fuzzy
 msgid "This is cfdisk, a curses-based disk partitioning program."
 msgstr "Això és el cfdisk, un programa per a la partició de discs basat en"
 
-#: disk-utils/cfdisk.c:2153
+#: disk-utils/cfdisk.c:2135
 #, fuzzy
 msgid "It lets you create, delete, and modify partitions on a block device."
 msgstr "curses, que us permet crear, suprimir i modificar particions del"
 
-#: disk-utils/cfdisk.c:2155
+#: disk-utils/cfdisk.c:2137
 msgid "Command      Meaning"
 msgstr "Ordre       Significat"
 
-#: disk-utils/cfdisk.c:2156
+#: disk-utils/cfdisk.c:2138
 msgid "-------      -------"
 msgstr "-----       ----------"
 
-#: disk-utils/cfdisk.c:2157
+#: disk-utils/cfdisk.c:2139
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Fixa el senyalador d'arrencada a la partició actual"
 
-#: disk-utils/cfdisk.c:2158
+#: disk-utils/cfdisk.c:2140
 msgid "  d          Delete the current partition"
 msgstr "  d          Suprimeix l'actual partició"
 
-#: disk-utils/cfdisk.c:2159
+#: disk-utils/cfdisk.c:2141
 msgid "  h          Print this screen"
 msgstr "  h          Imprimeix aquesta pantalla"
 
-#: disk-utils/cfdisk.c:2160
+#: disk-utils/cfdisk.c:2142
 msgid "  n          Create new partition from free space"
 msgstr "  n          Crea una nova partició des de l'espai lliure"
 
-#: disk-utils/cfdisk.c:2161
+#: disk-utils/cfdisk.c:2143
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Surt del programa sense escriure la taula de particions"
 
-#: disk-utils/cfdisk.c:2162
+#: disk-utils/cfdisk.c:2144
 #, fuzzy
 msgid "  s          Fix partitions order (only when in disarray)"
 msgstr "              paràmetres\n"
 
-#: disk-utils/cfdisk.c:2163
+#: disk-utils/cfdisk.c:2145
 #, fuzzy
 msgid "  t          Change the partition type"
 msgstr "  t          Canvia el tipus del sistema de fitxers"
 
-#: disk-utils/cfdisk.c:2164
+#: disk-utils/cfdisk.c:2146
 msgid "  u          Dump disk layout to sfdisk compatible script file"
 msgstr ""
 
-#: disk-utils/cfdisk.c:2165
+#: disk-utils/cfdisk.c:2147
 #, fuzzy
 msgid "  W          Write partition table to disk (you must enter uppercase W);"
 msgstr "  W          Escriu la taula de particions al disc (W en majúscula)"
 
-#: disk-utils/cfdisk.c:2166
+#: disk-utils/cfdisk.c:2148
 #, fuzzy
 msgid "               since this might destroy data on the disk, you must either"
 msgstr "             Com que això destruirà les dades del disc, ho haureu"
 
-#: disk-utils/cfdisk.c:2167
+#: disk-utils/cfdisk.c:2149
 #, fuzzy
 msgid "               confirm or deny the write by entering 'yes' or 'no'"
 msgstr "             de confirmar o denegar escrivint «sí» o"
 
-#: disk-utils/cfdisk.c:2168
+#: disk-utils/cfdisk.c:2150
 #, fuzzy
 msgid "  x          Display/hide extra information about a partition"
 msgstr "  -V, --version                Mostra la informació de la versió\n"
 
-#: disk-utils/cfdisk.c:2169
+#: disk-utils/cfdisk.c:2151
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Fletxa amunt Desplaça el cursor a l'anterior partició"
 
-#: disk-utils/cfdisk.c:2170
+#: disk-utils/cfdisk.c:2152
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Fletxa avall Desplaça el cursor a la següent partició"
 
-#: disk-utils/cfdisk.c:2171
+#: disk-utils/cfdisk.c:2153
 #, fuzzy
 msgid "Left Arrow   Move cursor to the previous menu item"
 msgstr "Fletxa amunt Desplaça el cursor a l'anterior partició"
 
-#: disk-utils/cfdisk.c:2172
+#: disk-utils/cfdisk.c:2154
 #, fuzzy
 msgid "Right Arrow  Move cursor to the next menu item"
 msgstr "Fletxa avall Desplaça el cursor a la següent partició"
 
-#: disk-utils/cfdisk.c:2174
+#: disk-utils/cfdisk.c:2156
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: Totes les ordres es poden escriure en majúscules o"
 
-#: disk-utils/cfdisk.c:2175
+#: disk-utils/cfdisk.c:2157
 #, fuzzy
 msgid "case letters (except for Write)."
 msgstr "minúscules (excepte W per a escriure)."
 
-#: disk-utils/cfdisk.c:2177
+#: disk-utils/cfdisk.c:2159
 msgid "Use lsblk(8) or partx(8) to see more details about the device."
 msgstr ""
 
-#: disk-utils/cfdisk.c:2184 disk-utils/cfdisk.c:2442
+#: disk-utils/cfdisk.c:2166 disk-utils/cfdisk.c:2424
 #, fuzzy
 msgid "Press a key to continue."
 msgstr "Premeu una tecla per a continuar"
 
-#: disk-utils/cfdisk.c:2266
+#: disk-utils/cfdisk.c:2248
 #, fuzzy
 msgid "Could not toggle the flag."
 msgstr "No s'ha pogut obrir %s\n"
 
-#: disk-utils/cfdisk.c:2276
+#: disk-utils/cfdisk.c:2258
 #, fuzzy, c-format
 msgid "Could not delete partition %zu."
 msgstr "S'ha seleccionat la partició %d\n"
 
-#: disk-utils/cfdisk.c:2278 disk-utils/fdisk-menu.c:601
+#: disk-utils/cfdisk.c:2260 disk-utils/fdisk-menu.c:633
 #, fuzzy, c-format
 msgid "Partition %zu has been deleted."
 msgstr "La partició %d no té cap àrea de dades\n"
 
-#: disk-utils/cfdisk.c:2299
+#: disk-utils/cfdisk.c:2281
 #, fuzzy
 msgid "Partition size: "
 msgstr ""
 "\n"
 "%d particions:\n"
 
-#: disk-utils/cfdisk.c:2340
+#: disk-utils/cfdisk.c:2322
 #, fuzzy, c-format
 msgid "Changed type of partition %zu."
 msgstr "S'ha canviat el tipus del sistema de la partició %d per %x (%s)\n"
 
-#: disk-utils/cfdisk.c:2342
+#: disk-utils/cfdisk.c:2324
 #, fuzzy, c-format
 msgid "The type of partition %zu is unchanged."
 msgstr "S'ha canviat el tipus del sistema de la partició %d per %x (%s)\n"
 
-#: disk-utils/cfdisk.c:2359 disk-utils/cfdisk.c:2471 disk-utils/fdisk.c:967
-#: disk-utils/fdisk-menu.c:538
+#: disk-utils/cfdisk.c:2341 disk-utils/cfdisk.c:2453 disk-utils/fdisk.c:987
+#: disk-utils/fdisk-menu.c:570
 msgid "Device is open in read-only mode."
 msgstr ""
 
-#: disk-utils/cfdisk.c:2364
+#: disk-utils/cfdisk.c:2346
 #, fuzzy
 msgid "Are you sure you want to write the partition table to disk? "
 msgstr "Esteu segur que voleu escriure la taula de particions al disc? (sí o no): "
 
-#: disk-utils/cfdisk.c:2366
+#: disk-utils/cfdisk.c:2348
 msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
 msgstr ""
 
 # FIXME: és possible que no es puga introduir l'accent. jm
-#: disk-utils/cfdisk.c:2371 login-utils/lslogins.c:208 sys-utils/lscpu.c:1346
-#: sys-utils/lscpu.c:1356
+#: disk-utils/cfdisk.c:2353 login-utils/lslogins.c:209 sys-utils/lscpu.c:1517
+#: sys-utils/lscpu.c:1527
 msgid "yes"
 msgstr "sí"
 
-#: disk-utils/cfdisk.c:2372
+#: disk-utils/cfdisk.c:2354
 #, fuzzy
 msgid "Did not write partition table to disk."
 msgstr "No s'ha escrit la taula de particions al disc"
 
-#: disk-utils/cfdisk.c:2377
+#: disk-utils/cfdisk.c:2359
 #, fuzzy
 msgid "Failed to write disklabel."
 msgstr "s'ha produït un error en cercar a write_tables"
 
-#: disk-utils/cfdisk.c:2380 disk-utils/fdisk-menu.c:546
+#: disk-utils/cfdisk.c:2362 disk-utils/fdisk-menu.c:578
 #, fuzzy
 msgid "The partition table has been altered."
 msgstr ""
 "S'ha modificat la taula de particions.\n"
 "\n"
 
-#: disk-utils/cfdisk.c:2403 disk-utils/cfdisk.c:2473
+#: disk-utils/cfdisk.c:2385 disk-utils/cfdisk.c:2455
 #, fuzzy
 msgid "Note that partition table entries are not in disk order now."
 msgstr ""
 "\n"
 "Les entrades a la taula de particions no estan en l'ordre del disc\n"
 
-#: disk-utils/cfdisk.c:2439
+#: disk-utils/cfdisk.c:2421
 #, c-format
 msgid "Device already contains a %s signature; it will be removed by a write command."
 msgstr ""
 
-#: disk-utils/cfdisk.c:2450
+#: disk-utils/cfdisk.c:2432
 #, fuzzy
 msgid "failed to create a new disklabel"
 msgstr "s'ha produït un error en cercar a write_tables"
 
-#: disk-utils/cfdisk.c:2458
+#: disk-utils/cfdisk.c:2440
 #, fuzzy
 msgid "failed to read partitions"
 msgstr "torna a llegir la taula de particions"
 
-#: disk-utils/cfdisk.c:2547
+#: disk-utils/cfdisk.c:2529
 #, fuzzy, c-format
 msgid " %1$s [options] <disk>\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: disk-utils/cfdisk.c:2550 disk-utils/fdisk.c:728 disk-utils/sfdisk.c:1729
+#: disk-utils/cfdisk.c:2532 disk-utils/fdisk.c:736 disk-utils/sfdisk.c:1792
 #, fuzzy
 msgid "Display or manipulate a disk partition table.\n"
 msgstr "torna a llegir la taula de particions"
 
-#: disk-utils/cfdisk.c:2553
+#: disk-utils/cfdisk.c:2535
 #, fuzzy
 msgid " -L, --color[=<when>]     colorize output (auto, always or never)\n"
 msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
 
-#: disk-utils/cfdisk.c:2556
+#: disk-utils/cfdisk.c:2538
 #, fuzzy
 msgid " -z, --zero               start with zeroed partition table\n"
 msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
 
-#: disk-utils/cfdisk.c:2595 disk-utils/fdisk.c:872 disk-utils/sfdisk.c:1981
-#: misc-utils/cal.c:381 sys-utils/dmesg.c:1334 text-utils/hexdump.c:114
+#: disk-utils/cfdisk.c:2577 disk-utils/fdisk.c:882 disk-utils/sfdisk.c:2059
+#: misc-utils/cal.c:388 sys-utils/dmesg.c:1333 text-utils/hexdump.c:114
 #, fuzzy
 msgid "unsupported color mode"
 msgstr "cap ordre?\n"
 
-#: disk-utils/cfdisk.c:2613 disk-utils/fdisk.c:808 disk-utils/sfdisk.c:221
+#: disk-utils/cfdisk.c:2595 disk-utils/fdisk.c:818 disk-utils/sfdisk.c:223
 #, fuzzy
 msgid "failed to allocate libfdisk context"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
@@ -760,8 +761,8 @@ msgstr ""
 "S'està continuant... "
 
 #: disk-utils/fdformat.c:144 disk-utils/fsck.minix.c:182
-#: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:456
-#: sys-utils/blkdiscard.c:84 sys-utils/tunelp.c:91
+#: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:456 sys-utils/blkdiscard.c:84
+#: sys-utils/tunelp.c:91
 #, fuzzy, c-format
 msgid " %s [options] <device>\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
@@ -804,20 +805,20 @@ msgid "invalid argument - repair"
 msgstr "id invàlid : %s\n"
 
 #: disk-utils/fdformat.c:221 disk-utils/fsck.cramfs.c:145
-#: disk-utils/mkfs.bfs.c:185 disk-utils/mkfs.cramfs.c:330
+#: disk-utils/mkfs.bfs.c:185 disk-utils/mkfs.cramfs.c:332
 #: disk-utils/mkfs.cramfs.c:742 disk-utils/mkfs.cramfs.c:779
-#: disk-utils/mkfs.minix.c:820 disk-utils/mkswap.c:241 disk-utils/partx.c:933
-#: login-utils/last.c:667 login-utils/utmpdump.c:129 misc-utils/namei.c:135
+#: disk-utils/mkfs.minix.c:816 disk-utils/mkswap.c:241 disk-utils/partx.c:933
+#: login-utils/last.c:686 login-utils/utmpdump.c:139 misc-utils/namei.c:135
 #: misc-utils/rename.c:63 sys-utils/blkdiscard.c:186 sys-utils/dmesg.c:524
 #: sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:131 sys-utils/fstrim.c:77
 #: sys-utils/swapon.c:519 sys-utils/switch_root.c:93
-#: sys-utils/switch_root.c:133 term-utils/mesg.c:129 text-utils/more.c:509
-#: text-utils/tailf.c:104 text-utils/tailf.c:281
+#: sys-utils/switch_root.c:133 term-utils/mesg.c:129 text-utils/more.c:504
+#: text-utils/tailf.c:103 text-utils/tailf.c:280
 #, fuzzy, c-format
 msgid "stat of %s failed"
 msgstr "(Fitxer següent: %s)"
 
-#: disk-utils/fdformat.c:224 disk-utils/partx.c:991 misc-utils/lsblk.c:1476
+#: disk-utils/fdformat.c:224 disk-utils/partx.c:991 misc-utils/lsblk.c:1485
 #: sys-utils/blkdiscard.c:188 sys-utils/mountpoint.c:107
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -853,266 +854,272 @@ msgstr ""
 msgid "user defined start track exceeds the user defined end track"
 msgstr ""
 
-#: disk-utils/fdformat.c:251 misc-utils/logger.c:979
+#: disk-utils/fdformat.c:251 misc-utils/logger.c:976
 #, fuzzy
 msgid "close failed"
 msgstr "la cerca ha fallat"
 
-#: disk-utils/fdisk.c:92 disk-utils/fdisk.c:108
+#: disk-utils/fdisk.c:95 disk-utils/fdisk.c:111
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Do you really want to quit? "
 msgstr "Esteu segur de voler continuar?"
 
-#: disk-utils/fdisk.c:155
+#: disk-utils/fdisk.c:158
 #, fuzzy, c-format
 msgid "Select (default %c): "
 msgstr "%s (%u-%u, valor per defecte %u): "
 
-#: disk-utils/fdisk.c:160
+#: disk-utils/fdisk.c:163
 #, fuzzy, c-format
 msgid "Using default response %c."
 msgstr "S'està utilitzant el valor per defecte %u\n"
 
-#: disk-utils/fdisk.c:173 disk-utils/fdisk.c:247 disk-utils/fdisk.c:322
-#: libfdisk/src/dos.c:1189 libfdisk/src/gpt.c:2257
+#: disk-utils/fdisk.c:176 disk-utils/fdisk.c:250 disk-utils/fdisk.c:325
+#: libfdisk/src/dos.c:1189 libfdisk/src/gpt.c:2260
 #, fuzzy
 msgid "Value out of range."
 msgstr "El valor està fora del rang.\n"
 
-#: disk-utils/fdisk.c:202
+#: disk-utils/fdisk.c:205
 #, fuzzy, c-format
 msgid "%s (%s, default %c): "
 msgstr "%s (%u-%u, valor per defecte %u): "
 
-#: disk-utils/fdisk.c:205 disk-utils/fdisk.c:272
+#: disk-utils/fdisk.c:208 disk-utils/fdisk.c:275
 #, fuzzy, c-format
 msgid "%s (%s, default %<PRIu64>): "
 msgstr "%s (%u-%u, valor per defecte %u): "
 
-#: disk-utils/fdisk.c:210
+#: disk-utils/fdisk.c:213
 #, fuzzy, c-format
 msgid "%s (%c-%c, default %c): "
 msgstr "%s (%u-%u, valor per defecte %u): "
 
-#: disk-utils/fdisk.c:214 disk-utils/fdisk.c:276
+#: disk-utils/fdisk.c:217 disk-utils/fdisk.c:279
 #, fuzzy, c-format
 msgid "%s (%<PRIu64>-%<PRIu64>, default %<PRIu64>): "
 msgstr "%s (%u-%u, valor per defecte %u): "
 
-#: disk-utils/fdisk.c:217
+#: disk-utils/fdisk.c:220
 #, fuzzy, c-format
 msgid "%s (%c-%c): "
 msgstr "%s (%s)\n"
 
-#: disk-utils/fdisk.c:220 disk-utils/fdisk.c:279
+#: disk-utils/fdisk.c:223 disk-utils/fdisk.c:282
 #, fuzzy, c-format
 msgid "%s (%<PRIu64>-%<PRIu64>): "
 msgstr "%s (%s)\n"
 
-#: disk-utils/fdisk.c:389 disk-utils/sfdisk.c:195
+#: disk-utils/fdisk.c:392 disk-utils/sfdisk.c:197
 msgid " [Y]es/[N]o: "
 msgstr ""
 
-#: disk-utils/fdisk.c:430
+#: disk-utils/fdisk.c:433
 #, fuzzy
 msgid "Partition type (type L to list all types): "
 msgstr "Codi hex. (escriviu L per veure la llista de codis): "
 
-#: disk-utils/fdisk.c:431
+#: disk-utils/fdisk.c:434
 #, fuzzy
 msgid "Hex code (type L to list all codes): "
 msgstr "Codi hex. (escriviu L per veure la llista de codis): "
 
-#: disk-utils/fdisk.c:528
+#: disk-utils/fdisk.c:536
 #, fuzzy
 msgid "DOS Compatibility flag is set (DEPRECATED!)"
 msgstr "S'ha establert el senyalador de compatibilitat amb DOS\n"
 
-#: disk-utils/fdisk.c:529
+#: disk-utils/fdisk.c:537
 #, fuzzy
 msgid "DOS Compatibility flag is not set"
 msgstr "No s'ha establert el senyalador de compatibilitat amb DOS\n"
 
-#: disk-utils/fdisk.c:550 disk-utils/fdisk.c:586
+#: disk-utils/fdisk.c:558 disk-utils/fdisk.c:594
 #, fuzzy, c-format
 msgid "Partition %zu does not exist yet!"
 msgstr "La partició %d encara no existeix.\n"
 
-#: disk-utils/fdisk.c:555 disk-utils/fdisk.c:564 libfdisk/src/ask.c:995
+#: disk-utils/fdisk.c:563 disk-utils/fdisk.c:572 libfdisk/src/ask.c:995
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: disk-utils/fdisk.c:563
+#: disk-utils/fdisk.c:571
 #, fuzzy, c-format
 msgid "Changed type of partition '%s' to '%s'."
 msgstr "S'ha canviat el tipus del sistema de la partició %d per %x (%s)\n"
 
-#: disk-utils/fdisk.c:567
+#: disk-utils/fdisk.c:575
 #, fuzzy, c-format
 msgid "Type of partition %zu is unchanged: %s."
 msgstr "S'ha canviat el tipus del sistema de la partició %d per %x (%s)\n"
 
-#: disk-utils/fdisk.c:606
+#: disk-utils/fdisk.c:614
 #, fuzzy, c-format
 msgid "%15s: %s"
 msgstr "disc: %.*s\n"
 
-#: disk-utils/fdisk.c:663
+#: disk-utils/fdisk.c:671
 #, c-format
 msgid ""
 "\n"
 "%s: offset = %<PRIu64>, size = %zu bytes."
 msgstr ""
 
-#: disk-utils/fdisk.c:669
+#: disk-utils/fdisk.c:677
 #, fuzzy
 msgid "cannot seek"
 msgstr "no s'ha pogut bifurcar"
 
-#: disk-utils/fdisk.c:674
+#: disk-utils/fdisk.c:682
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: no s'ha pogut llegir %s.\n"
 
 # Parla d'etiquetes, segurament és femení
-#: disk-utils/fdisk.c:687 libfdisk/src/bsd.c:259 libfdisk/src/dos.c:933
-#: libfdisk/src/gpt.c:2190
+#: disk-utils/fdisk.c:695 libfdisk/src/bsd.c:259 libfdisk/src/dos.c:933
+#: libfdisk/src/gpt.c:2193
 #, fuzzy
 msgid "First sector"
 msgstr "Primera %s"
 
-#: disk-utils/fdisk.c:714
+#: disk-utils/fdisk.c:722
 #, fuzzy, c-format
 msgid "BLKGETSIZE ioctl failed on %s"
 msgstr "No s'ha pogut executar ioctl BLKGETSIZE a %s\n"
 
-#: disk-utils/fdisk.c:723
+#: disk-utils/fdisk.c:731
 #, c-format
 msgid ""
 " %1$s [options] <disk>      change partition table\n"
 " %1$s [options] -l [<disk>] list partition table(s)\n"
 msgstr ""
 
-#: disk-utils/fdisk.c:731
+#: disk-utils/fdisk.c:739
 #, fuzzy
 msgid " -b, --sector-size <size>      physical and logical sector size\n"
 msgstr "  -V, --version                Mostra la informació de la versió\n"
 
-#: disk-utils/fdisk.c:732
+#: disk-utils/fdisk.c:740
 msgid " -B, --protect-boot            don't erase bootbits when creating a new label\n"
 msgstr ""
 
-#: disk-utils/fdisk.c:733
+#: disk-utils/fdisk.c:741
 msgid " -c, --compatibility[=<mode>]  mode is 'dos' or 'nondos' (default)\n"
 msgstr ""
 
-#: disk-utils/fdisk.c:734
+#: disk-utils/fdisk.c:742
 #, fuzzy
 msgid " -L, --color[=<when>]          colorize output (auto, always or never)\n"
 msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
 
-#: disk-utils/fdisk.c:737
+#: disk-utils/fdisk.c:745
 #, fuzzy
-msgid " -l, --list                    display partitions end exit\n"
+msgid " -l, --list                    display partitions and exit\n"
 msgstr "  -h, --help                   Aquesta petita guia d'ús\n"
 
-#: disk-utils/fdisk.c:738
+#: disk-utils/fdisk.c:746
 #, fuzzy
 msgid " -o, --output <list>           output columns\n"
 msgstr "  -o, --options=cadena_opcions Opcions curtes a reconèixer\n"
 
-#: disk-utils/fdisk.c:739
+#: disk-utils/fdisk.c:747
 #, fuzzy
 msgid " -t, --type <type>             recognize specified partition table type only\n"
 msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
 
-#: disk-utils/fdisk.c:740
+#: disk-utils/fdisk.c:748
 msgid " -u, --units[=<unit>]          display units: 'cylinders' or 'sectors' (default)\n"
 msgstr ""
 
-#: disk-utils/fdisk.c:741
+#: disk-utils/fdisk.c:749
 #, fuzzy
 msgid " -s, --getsz                   display device size in 512-byte sectors [DEPRECATED]\n"
 msgstr "  -h, --help                   Aquesta petita guia d'ús\n"
 
-#: disk-utils/fdisk.c:742
+#: disk-utils/fdisk.c:750
 #, fuzzy
 msgid "     --bytes                   print SIZE in bytes rather than in human readable format\n"
 msgstr "  -u, --unqote                 No es posarà la sortida entre cometes\n"
 
-#: disk-utils/fdisk.c:743
+#: disk-utils/fdisk.c:751
 #, fuzzy
 msgid " -w, --wipe <mode>             wipe signatures (auto, always or never)\n"
 msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
 
-#: disk-utils/fdisk.c:746
+#: disk-utils/fdisk.c:752 disk-utils/sfdisk.c:1835
+#, fuzzy
+msgid " -W, --wipe-partitions <mode>  wipe signatures from new partitions (auto, always or never)\n"
+msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
+
+#: disk-utils/fdisk.c:755
 #, fuzzy
 msgid " -C, --cylinders <number>      specify the number of cylinders\n"
 msgstr "Introduïu el nombre de cilindres: "
 
-#: disk-utils/fdisk.c:747
+#: disk-utils/fdisk.c:756
 #, fuzzy
 msgid " -H, --heads <number>          specify the number of heads\n"
 msgstr "    -H# [o --heads #]:     Estableix el nombre de capçals que s'usaran"
 
-#: disk-utils/fdisk.c:748
+#: disk-utils/fdisk.c:757
 #, fuzzy
 msgid " -S, --sectors <number>        specify the number of sectors per track\n"
 msgstr "Introduïu el nombre de sectors per pista: "
 
-#: disk-utils/fdisk.c:818
+#: disk-utils/fdisk.c:828
 #, fuzzy
 msgid "invalid sector size argument"
 msgstr "identificador invàlid"
 
-#: disk-utils/fdisk.c:830
+#: disk-utils/fdisk.c:840
 #, fuzzy
 msgid "invalid cylinders argument"
 msgstr "identificador invàlid"
 
-#: disk-utils/fdisk.c:842
+#: disk-utils/fdisk.c:852
 #, fuzzy
 msgid "not found DOS label driver"
 msgstr "%s: no s'ha pogut trobar el dispositiu per a %s\n"
 
-#: disk-utils/fdisk.c:848
+#: disk-utils/fdisk.c:858
 #, fuzzy, c-format
 msgid "unknown compatibility mode '%s'"
 msgstr "No hi ha cap directori %s\n"
 
-#: disk-utils/fdisk.c:857
+#: disk-utils/fdisk.c:867
 #, fuzzy
 msgid "invalid heads argument"
 msgstr "identificador invàlid"
 
-#: disk-utils/fdisk.c:863
+#: disk-utils/fdisk.c:873
 #, fuzzy
 msgid "invalid sectors argument"
 msgstr "identificador invàlid"
 
-#: disk-utils/fdisk.c:889
+#: disk-utils/fdisk.c:899
 #, fuzzy, c-format
 msgid "unsupported disklabel: %s"
 msgstr "%s: argument desconegut: %s\n"
 
-#: disk-utils/fdisk.c:906 disk-utils/sfdisk.c:1950
+#: disk-utils/fdisk.c:916 disk-utils/fdisk.c:921 disk-utils/sfdisk.c:2023
+#: disk-utils/sfdisk.c:2028
 #, fuzzy
 msgid "unsupported wipe mode"
 msgstr "cap ordre?\n"
 
-#: disk-utils/fdisk.c:919
+#: disk-utils/fdisk.c:934
 #, fuzzy
 msgid "The device properties (sector size and geometry) should be used with one specified device only."
 msgstr "Avís: l'opció -b (estableix la mida del sector) s'ha d'usar amb un dispositiu específic\n"
 
-#: disk-utils/fdisk.c:958
+#: disk-utils/fdisk.c:978
 #, c-format
 msgid "Welcome to fdisk (%s)."
 msgstr ""
 
-#: disk-utils/fdisk.c:960 disk-utils/sfdisk.c:1515
+#: disk-utils/fdisk.c:980 disk-utils/sfdisk.c:1572
 #, fuzzy
 msgid ""
 "Changes will remain in memory only, until you decide to write them.\n"
@@ -1123,20 +1130,21 @@ msgstr ""
 "contingut serà irrecuperable.\n"
 "\n"
 
-#: disk-utils/fdisk.c:977 disk-utils/sfdisk.c:1540
+#: disk-utils/fdisk.c:997 disk-utils/sfdisk.c:1597
 #, c-format
 msgid "Device %s already contains a %s signature."
 msgstr ""
 
-#: disk-utils/fdisk.c:986 disk-utils/sfdisk.c:1549
+#: disk-utils/fdisk.c:1006 disk-utils/fdisk-menu.c:542 disk-utils/sfdisk.c:1468
+#: disk-utils/sfdisk.c:1606
 msgid "The signature will be removed by a write command."
 msgstr ""
 
-#: disk-utils/fdisk.c:989 disk-utils/sfdisk.c:1552
+#: disk-utils/fdisk.c:1009 disk-utils/sfdisk.c:1609
 msgid "It is strongly recommended to wipe the device with wipefs(8), in order to avoid possible collisions."
 msgstr ""
 
-#: disk-utils/fdisk.c:998
+#: disk-utils/fdisk.c:1018
 msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')."
 msgstr ""
 
@@ -1212,24 +1220,24 @@ msgstr ""
 "\n"
 "Les entrades a la taula de particions no estan en l'ordre del disc\n"
 
-#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2302
-#: libfdisk/src/gpt.c:2772 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1110
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2300
+#: libfdisk/src/gpt.c:2889 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1110
 #, fuzzy
 msgid "Start"
 msgstr "inici"
 
-#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1016 libfdisk/src/dos.c:2303
-#: libfdisk/src/gpt.c:2773 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1111
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1016 libfdisk/src/dos.c:2301
+#: libfdisk/src/gpt.c:2890 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1111
 msgid "End"
 msgstr "Final"
 
-#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2304
-#: libfdisk/src/gpt.c:2774 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1112
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2302
+#: libfdisk/src/gpt.c:2891 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1112
 msgid "Sectors"
 msgstr "Sectors"
 
-#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2306
-#: libfdisk/src/gpt.c:2775 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1114
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2304
+#: libfdisk/src/gpt.c:2892 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1114
 msgid "Size"
 msgstr ""
 
@@ -1442,344 +1450,363 @@ msgstr ""
 "%d particions:\n"
 
 #: disk-utils/fdisk-menu.c:168
+#, fuzzy
+msgid "change table length"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
+
+#: disk-utils/fdisk-menu.c:169
 msgid "enter protective/hybrid MBR"
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:171
+#: disk-utils/fdisk-menu.c:172
 #, fuzzy
 msgid "toggle the legacy BIOS bootable flag"
 msgstr "   a   estableix un senyalador d'arrencada"
 
-#: disk-utils/fdisk-menu.c:172
+#: disk-utils/fdisk-menu.c:173
 #, fuzzy
 msgid "toggle the no block IO protocol flag"
 msgstr "   c   estableix el senyalador de compatibilitat amb DOS"
 
-#: disk-utils/fdisk-menu.c:173
+#: disk-utils/fdisk-menu.c:174
 #, fuzzy
 msgid "toggle the required partition flag"
 msgstr "   a   estableix un senyalador de només lectura"
 
-#: disk-utils/fdisk-menu.c:174
+#: disk-utils/fdisk-menu.c:175
 msgid "toggle the GUID specific bits"
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:184
+#: disk-utils/fdisk-menu.c:185
 msgid "Sun"
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:185
+#: disk-utils/fdisk-menu.c:186
 #, fuzzy
 msgid "toggle the read-only flag"
 msgstr "   a   estableix un senyalador de només lectura"
 
-#: disk-utils/fdisk-menu.c:186
+#: disk-utils/fdisk-menu.c:187
 #, fuzzy
 msgid "toggle the mountable flag"
 msgstr "   c   estableix senyalador de muntable"
 
-#: disk-utils/fdisk-menu.c:188
+#: disk-utils/fdisk-menu.c:189
 #, fuzzy
 msgid "change number of alternate cylinders"
 msgstr "   a   canvia el nombre de cilindres alternatius"
 
-#: disk-utils/fdisk-menu.c:189
+#: disk-utils/fdisk-menu.c:190
 #, fuzzy
 msgid "change number of extra sectors per cylinder"
 msgstr "   e   canvia el nombre de sectors addicionals per cilindre"
 
 # FIXME
-#: disk-utils/fdisk-menu.c:190
+#: disk-utils/fdisk-menu.c:191
 #, fuzzy
 msgid "change interleave factor"
 msgstr "   i   canvia el factor d'entrellaçat"
 
-#: disk-utils/fdisk-menu.c:191
+#: disk-utils/fdisk-menu.c:192
 #, fuzzy
 msgid "change rotation speed (rpm)"
 msgstr "   o   canvia velocitat de rotació (r.p.m.)"
 
-#: disk-utils/fdisk-menu.c:192
+#: disk-utils/fdisk-menu.c:193
 #, fuzzy
 msgid "change number of physical cylinders"
 msgstr "   y   canvia el nombre de cilindres físics"
 
-#: disk-utils/fdisk-menu.c:201
+#: disk-utils/fdisk-menu.c:202
 #, fuzzy
 msgid "SGI"
 msgstr "SGI cru"
 
-#: disk-utils/fdisk-menu.c:202
+#: disk-utils/fdisk-menu.c:203
 #, fuzzy
 msgid "select bootable partition"
 msgstr "   a   selecciona la partició d'arrencada"
 
-#: disk-utils/fdisk-menu.c:203
+#: disk-utils/fdisk-menu.c:204
 #, fuzzy
 msgid "edit bootfile entry"
 msgstr "   b   edita l'entrada del fitxer d'arrencada"
 
-#: disk-utils/fdisk-menu.c:204
+#: disk-utils/fdisk-menu.c:205
 #, fuzzy
 msgid "select sgi swap partition"
 msgstr "   c   selecciona la partició d'intercanvi sgi"
 
-#: disk-utils/fdisk-menu.c:205
+#: disk-utils/fdisk-menu.c:206
 msgid "create SGI info"
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:214
+#: disk-utils/fdisk-menu.c:215
 #, fuzzy
 msgid "DOS (MBR)"
 msgstr "DOS R/O"
 
-#: disk-utils/fdisk-menu.c:215
+#: disk-utils/fdisk-menu.c:216
 #, fuzzy
 msgid "toggle a bootable flag"
 msgstr "   a   estableix un senyalador d'arrencada"
 
-#: disk-utils/fdisk-menu.c:216
+#: disk-utils/fdisk-menu.c:217
 #, fuzzy
 msgid "edit nested BSD disklabel"
 msgstr "   b   edita l'etiqueta de disc bsd"
 
-#: disk-utils/fdisk-menu.c:217
+#: disk-utils/fdisk-menu.c:218
 #, fuzzy
 msgid "toggle the dos compatibility flag"
 msgstr "   c   estableix el senyalador de compatibilitat amb DOS"
 
-#: disk-utils/fdisk-menu.c:219
+#: disk-utils/fdisk-menu.c:220
 #, fuzzy
 msgid "move beginning of data in a partition"
 msgstr "   b   desplaça les dades d'una partició a l'inici"
 
-#: disk-utils/fdisk-menu.c:220
+#: disk-utils/fdisk-menu.c:221
 #, fuzzy
 msgid "change the disk identifier"
 msgstr "   u   canvia les unitats de visualització/entrada"
 
-#: disk-utils/fdisk-menu.c:222
+#: disk-utils/fdisk-menu.c:223
 msgid "return from protective/hybrid MBR to GPT"
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:232
+#: disk-utils/fdisk-menu.c:233
 #, fuzzy
 msgid "BSD"
 msgstr "BSD/OS"
 
-#: disk-utils/fdisk-menu.c:233
+#: disk-utils/fdisk-menu.c:234
 #, fuzzy
 msgid "edit drive data"
 msgstr "   e   edita dades de la unitat"
 
-#: disk-utils/fdisk-menu.c:234
+#: disk-utils/fdisk-menu.c:235
 #, fuzzy
 msgid "install bootstrap"
 msgstr "   i   instal·la el carregador d'arrencada"
 
-#: disk-utils/fdisk-menu.c:235
+#: disk-utils/fdisk-menu.c:236
 #, fuzzy
 msgid "show complete disklabel"
 msgstr "   s   mostra totes les etiquetes del disc"
 
-#: disk-utils/fdisk-menu.c:236
+#: disk-utils/fdisk-menu.c:237
 #, fuzzy
 msgid "link BSD partition to non-BSD partition"
 msgstr "   x   enllaça la partició BSD a una partició no BSD"
 
-#: disk-utils/fdisk-menu.c:368
+#: disk-utils/fdisk-menu.c:369
 #, c-format
 msgid ""
 "\n"
 "Help (expert commands):\n"
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:370 disk-utils/sfdisk.c:1245
+#: disk-utils/fdisk-menu.c:371 disk-utils/sfdisk.c:1249
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Help:\n"
 msgstr "Ajuda"
 
-#: disk-utils/fdisk-menu.c:390
+#: disk-utils/fdisk-menu.c:391
 #, c-format
 msgid "You're editing nested '%s' partition table, primary partition table is '%s'."
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:420
+#: disk-utils/fdisk-menu.c:421
 msgid "Expert command (m for help): "
 msgstr "Ordre d'expert (m per a obtenir ajuda): "
 
-#: disk-utils/fdisk-menu.c:422
+#: disk-utils/fdisk-menu.c:423
 msgid "Command (m for help): "
 msgstr "Ordre (m per a obtenir ajuda): "
 
-#: disk-utils/fdisk-menu.c:432
+#: disk-utils/fdisk-menu.c:433
 #, fuzzy, c-format
 msgid "%c: unknown command"
 msgstr "%c: ordre desconeguda\n"
 
-#: disk-utils/fdisk-menu.c:457 disk-utils/fdisk-menu.c:484
+#: disk-utils/fdisk-menu.c:458 disk-utils/fdisk-menu.c:485
 #, fuzzy
 msgid "Enter script file name"
 msgstr "%s: no s'ha pogut trobar el dispositiu per a %s\n"
 
-#: disk-utils/fdisk-menu.c:470
+#: disk-utils/fdisk-menu.c:471
 msgid "Script successfully applied."
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:496
+#: disk-utils/fdisk-menu.c:497
 #, fuzzy
 msgid "Failed to transform disk layout into script"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
-#: disk-utils/fdisk-menu.c:510
+#: disk-utils/fdisk-menu.c:511
 msgid "Script successfully saved."
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:543
+#: disk-utils/fdisk-menu.c:534 disk-utils/sfdisk.c:1460
+#, fuzzy, c-format
+msgid "Partition #%zu contains a %s signature."
+msgstr "Avís: la partició %d conté el sector 0\n"
+
+#: disk-utils/fdisk-menu.c:537 disk-utils/sfdisk.c:1463
+#, fuzzy
+msgid "Do you want to remove the signature?"
+msgstr "Desitgeu escriure això al disc? [ynq] "
+
+#: disk-utils/fdisk-menu.c:575
 #, fuzzy
 msgid "failed to write disklabel"
 msgstr "s'ha produït un error en cercar a write_tables"
 
-#: disk-utils/fdisk-menu.c:581
+#: disk-utils/fdisk-menu.c:613
 #, fuzzy
 msgid "Failed to fix partitions order."
 msgstr "   f   arregla l'ordre de les particions"
 
-#: disk-utils/fdisk-menu.c:583
+#: disk-utils/fdisk-menu.c:615
 #, fuzzy
 msgid "Partitions order fixed."
 msgstr "No hi han particions definides\n"
 
-#: disk-utils/fdisk-menu.c:599
+#: disk-utils/fdisk-menu.c:631
 #, fuzzy, c-format
 msgid "Could not delete partition %zu"
 msgstr "S'ha seleccionat la partició %d\n"
 
-#: disk-utils/fdisk-menu.c:623
+#: disk-utils/fdisk-menu.c:660
 #, fuzzy
 msgid "Changing display/entry units to cylinders (DEPRECATED!)."
 msgstr "S'està canviant les unitats de visualització/entrada a %s\n"
 
-#: disk-utils/fdisk-menu.c:625
+#: disk-utils/fdisk-menu.c:662
 #, fuzzy
 msgid "Changing display/entry units to sectors."
 msgstr "S'està canviant les unitats de visualització/entrada a %s\n"
 
-#: disk-utils/fdisk-menu.c:635 disk-utils/fdisk-menu.c:798
+#: disk-utils/fdisk-menu.c:672 disk-utils/fdisk-menu.c:842
 #, fuzzy
 msgid "Leaving nested disklabel."
 msgstr "   b   edita l'etiqueta de disc bsd"
 
-#: disk-utils/fdisk-menu.c:675
+#: disk-utils/fdisk-menu.c:709
+msgid "New maximum entries"
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:719
 #, fuzzy
 msgid "Entering protective/hybrid MBR disklabel."
 msgstr "   b   edita l'etiqueta de disc bsd"
 
-#: disk-utils/fdisk-menu.c:691
+#: disk-utils/fdisk-menu.c:735
 msgid "New UUID (in 8-4-4-4-12 format)"
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:706
+#: disk-utils/fdisk-menu.c:750
 #, fuzzy
 msgid "New name"
 msgstr "Nom d'usuari il·legal"
 
-#: disk-utils/fdisk-menu.c:769
+#: disk-utils/fdisk-menu.c:813
 #, fuzzy
 msgid "Entering nested BSD disklabel."
 msgstr "   b   edita l'etiqueta de disc bsd"
 
-#: disk-utils/fdisk-menu.c:954
+#: disk-utils/fdisk-menu.c:998
 msgid "Number of cylinders"
 msgstr "Nombre de cilindres"
 
-#: disk-utils/fdisk-menu.c:958
+#: disk-utils/fdisk-menu.c:1002
 msgid "Number of heads"
 msgstr "Nombre de capçals"
 
-#: disk-utils/fdisk-menu.c:962
+#: disk-utils/fdisk-menu.c:1006
 msgid "Number of sectors"
 msgstr "Nombre de sectors"
 
-#: disk-utils/fsck.c:213
+#: disk-utils/fsck.c:215
 #, fuzzy, c-format
 msgid "%s is mounted\n"
 msgstr "%s està muntat.\t "
 
-#: disk-utils/fsck.c:215
+#: disk-utils/fsck.c:217
 #, fuzzy, c-format
 msgid "%s is not mounted\n"
 msgstr "umount: %s: no s'ha trobat"
 
-#: disk-utils/fsck.c:329 disk-utils/fsck.cramfs.c:168
+#: disk-utils/fsck.c:331 disk-utils/fsck.cramfs.c:168
 #: disk-utils/fsck.cramfs.c:175 disk-utils/fsck.cramfs.c:229
-#: disk-utils/fsck.cramfs.c:247 disk-utils/sfdisk.c:295 libfdisk/src/bsd.c:646
+#: disk-utils/fsck.cramfs.c:247 disk-utils/sfdisk.c:297 libfdisk/src/bsd.c:646
 #: lib/path.c:110 lib/path.c:131 lib/path.c:152 lib/path.c:200
-#: login-utils/last.c:191 login-utils/last.c:228 login-utils/sulogin.c:694
-#: sys-utils/setpriv.c:239 term-utils/setterm.c:725 term-utils/setterm.c:782
-#: term-utils/setterm.c:786 term-utils/setterm.c:793
+#: login-utils/last.c:213 login-utils/last.c:250 login-utils/sulogin.c:660
+#: sys-utils/setpriv.c:239 term-utils/setterm.c:717 term-utils/setterm.c:774
+#: term-utils/setterm.c:778 term-utils/setterm.c:785
 #, fuzzy, c-format
 msgid "cannot read %s"
 msgstr "%s: no s'ha pogut llegir %s.\n"
 
-#: disk-utils/fsck.c:331 lib/path.c:133 lib/path.c:154
+#: disk-utils/fsck.c:333 lib/path.c:133 lib/path.c:154
 #, fuzzy, c-format
 msgid "parse error: %s"
 msgstr "s'ha produït un error en cercar"
 
-#: disk-utils/fsck.c:358
+#: disk-utils/fsck.c:360
 #, fuzzy, c-format
 msgid "cannot create directory %s"
 msgstr "namei: no s'ha pogut obtenir el directori actual - %s\n"
 
-#: disk-utils/fsck.c:371
+#: disk-utils/fsck.c:373
 #, fuzzy, c-format
 msgid "Locking disk by %s ... "
 msgstr "S'estan sincronitzant els discs.\n"
 
-#: disk-utils/fsck.c:382
+#: disk-utils/fsck.c:384
 #, c-format
 msgid "(waiting) "
 msgstr ""
 
 #. TRANSLATORS: These are followups to "Locking disk...".
-#: disk-utils/fsck.c:392
+#: disk-utils/fsck.c:394
 #, fuzzy
 msgid "succeeded"
 msgstr "%s s'ha completat amb èxit.\n"
 
-#: disk-utils/fsck.c:392
+#: disk-utils/fsck.c:394
 #, fuzzy
 msgid "failed"
 msgstr "la cerca ha fallat"
 
-#: disk-utils/fsck.c:410
+#: disk-utils/fsck.c:412
 #, fuzzy, c-format
 msgid "Unlocking %s.\n"
 msgstr "Usant %s.\n"
 
-#: disk-utils/fsck.c:443
+#: disk-utils/fsck.c:444
 #, fuzzy, c-format
 msgid "failed to setup description for %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
-#: disk-utils/fsck.c:473 misc-utils/findmnt.c:807 misc-utils/lsblk.c:433
+#: disk-utils/fsck.c:474 misc-utils/findmnt.c:807 misc-utils/lsblk.c:433
 #: sys-utils/mount.c:102 sys-utils/swapon-common.c:19 sys-utils/umount.c:46
 #, fuzzy, c-format
 msgid "%s: parse error at line %d -- ignored"
 msgstr "s'ha produït un error en cercar"
 
-#: disk-utils/fsck.c:505 disk-utils/fsck.c:507
+#: disk-utils/fsck.c:506 disk-utils/fsck.c:508
 #, fuzzy, c-format
 msgid "%s: failed to parse fstab"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: disk-utils/fsck.c:679 login-utils/login.c:967 login-utils/sulogin.c:1063
-#: login-utils/vipw.c:204 sys-utils/flock.c:326 sys-utils/nsenter.c:151
+#: disk-utils/fsck.c:679 login-utils/login.c:968 login-utils/sulogin.c:1029
+#: login-utils/vipw.c:204 sys-utils/flock.c:337 sys-utils/nsenter.c:153
 #: sys-utils/swapon.c:316 sys-utils/unshare.c:219 sys-utils/unshare.c:420
-#: term-utils/script.c:774
+#: term-utils/script.c:780
 #, fuzzy
 msgid "fork failed"
 msgstr "no s'ha pogut bifurcar\n"
@@ -1793,7 +1820,7 @@ msgstr "no ha estat possible executar openpty\n"
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: disk-utils/fsck.c:777 sys-utils/flock.c:343 sys-utils/swapon.c:348
+#: disk-utils/fsck.c:777 sys-utils/flock.c:347 sys-utils/swapon.c:348
 #: sys-utils/unshare.c:404 sys-utils/unshare.c:425
 #, fuzzy
 msgid "waitpid failed"
@@ -2024,7 +2051,7 @@ msgstr "%s: el cramfs és invàlid, la longitud del fitxer és massa curta\n"
 
 #: disk-utils/fsck.cramfs.c:173 disk-utils/fsck.cramfs.c:227
 #: disk-utils/fsck.cramfs.c:243 libfdisk/src/bsd.c:718 libfdisk/src/bsd.c:890
-#: login-utils/last.c:186 login-utils/last.c:220 sys-utils/fallocate.c:203
+#: login-utils/last.c:208 login-utils/last.c:242 sys-utils/fallocate.c:203
 #, fuzzy, c-format
 msgid "seek on %s failed"
 msgstr "la cerca ha fallat"
@@ -2079,7 +2106,7 @@ msgstr ""
 msgid "crc error"
 msgstr ", error"
 
-#: disk-utils/fsck.cramfs.c:296 disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.cramfs.c:296 disk-utils/fsck.minix.c:554
 msgid "seek failed"
 msgstr "la cerca ha fallat"
 
@@ -2112,7 +2139,7 @@ msgstr "s'ha produït un error en cercar"
 msgid "  hole at %lu (%zu)\n"
 msgstr "  forat a %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:391 disk-utils/fsck.cramfs.c:546
+#: disk-utils/fsck.cramfs.c:391 disk-utils/fsck.cramfs.c:544
 #, fuzzy, c-format
 msgid "  uncompressing block at %lu to %lu (%lu)\n"
 msgstr "  s'està descomprimint el bloc de %ld a %ld (%ld)\n"
@@ -2128,128 +2155,128 @@ msgstr "%s: No bloc (%ld) octets\n"
 msgid "non-size (%ld vs %ld) bytes"
 msgstr "%s: Octets sense mida (%ld vs %ld)\n"
 
-#: disk-utils/fsck.cramfs.c:408 disk-utils/fsck.cramfs.c:512
-#: disk-utils/swaplabel.c:104 misc-utils/uuidd.c:376 sys-utils/fallocate.c:382
+#: disk-utils/fsck.cramfs.c:407 disk-utils/fsck.cramfs.c:510
+#: disk-utils/swaplabel.c:104 misc-utils/uuidd.c:375 sys-utils/fallocate.c:382
 #: sys-utils/setpriv.c:535 sys-utils/setpriv.c:558 sys-utils/swapon.c:389
 #: term-utils/ttymsg.c:175
 #, fuzzy, c-format
 msgid "write failed: %s"
 msgstr "(Fitxer següent: %s)"
 
-#: disk-utils/fsck.cramfs.c:420
+#: disk-utils/fsck.cramfs.c:418
 #, fuzzy, c-format
 msgid "lchown failed: %s"
 msgstr "no s'ha estat possible muntar"
 
-#: disk-utils/fsck.cramfs.c:424
+#: disk-utils/fsck.cramfs.c:422
 #, fuzzy, c-format
 msgid "chown failed: %s"
 msgstr "no s'ha estat possible muntar"
 
-#: disk-utils/fsck.cramfs.c:429
+#: disk-utils/fsck.cramfs.c:427
 #, fuzzy, c-format
 msgid "utime failed: %s"
 msgstr "valor d'expiració erroni: %s"
 
-#: disk-utils/fsck.cramfs.c:441
+#: disk-utils/fsck.cramfs.c:439
 #, c-format
 msgid "directory inode has zero offset and non-zero size: %s"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:456
+#: disk-utils/fsck.cramfs.c:454
 #, fuzzy, c-format
 msgid "mkdir failed: %s"
 msgstr "/dev: chdir() ha fallat: %m"
 
-#: disk-utils/fsck.cramfs.c:472
+#: disk-utils/fsck.cramfs.c:470
 msgid "filename length is zero"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:474
+#: disk-utils/fsck.cramfs.c:472
 msgid "bad filename length"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:480
+#: disk-utils/fsck.cramfs.c:478
 #, fuzzy
 msgid "bad inode offset"
 msgstr "mida de node d'identificació incorrecte"
 
-#: disk-utils/fsck.cramfs.c:495
+#: disk-utils/fsck.cramfs.c:493
 msgid "file inode has zero offset and non-zero size"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:498
+#: disk-utils/fsck.cramfs.c:496
 msgid "file inode has zero size and non-zero offset"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:527
+#: disk-utils/fsck.cramfs.c:525
 msgid "symbolic link has zero offset"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:529
+#: disk-utils/fsck.cramfs.c:527
 msgid "symbolic link has zero size"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:538
+#: disk-utils/fsck.cramfs.c:536
 #, fuzzy, c-format
 msgid "size error in symlink: %s"
 msgstr "%s: hi ha un error en la mida de l'enllaç simbòlic «%s»\n"
 
-#: disk-utils/fsck.cramfs.c:552
+#: disk-utils/fsck.cramfs.c:550
 #, fuzzy, c-format
 msgid "symlink failed: %s"
 msgstr "no s'ha pogut fer fsync"
 
-#: disk-utils/fsck.cramfs.c:565
+#: disk-utils/fsck.cramfs.c:563
 #, c-format
 msgid "special file has non-zero offset: %s"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:575
+#: disk-utils/fsck.cramfs.c:573
 #, c-format
 msgid "fifo has non-zero size: %s"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:581
+#: disk-utils/fsck.cramfs.c:579
 #, c-format
 msgid "socket has non-zero size: %s"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:584
+#: disk-utils/fsck.cramfs.c:582
 #, fuzzy, c-format
 msgid "bogus mode: %s (%o)"
 msgstr "%s: mode erroni a «%s» (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:593
+#: disk-utils/fsck.cramfs.c:591
 #, fuzzy, c-format
 msgid "mknod failed: %s"
 msgstr "no s'ha estat possible muntar"
 
-#: disk-utils/fsck.cramfs.c:625
+#: disk-utils/fsck.cramfs.c:623
 #, fuzzy, c-format
 msgid "directory data start (%lu) < sizeof(struct cramfs_super) + start (%zu)"
 msgstr ""
 "%s: el cramfs és invàlid, el final de les dades als directoris (%ld)\n"
 "és diferent de l'inici de les dades dels fitxers (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:629
+#: disk-utils/fsck.cramfs.c:627
 #, fuzzy, c-format
 msgid "directory data end (%lu) != file data start (%lu)"
 msgstr ""
 "%s: el cramfs és invàlid, el final de les dades als directoris (%ld)\n"
 "és diferent de l'inici de les dades dels fitxers (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:634
+#: disk-utils/fsck.cramfs.c:631
 #, fuzzy
 msgid "invalid file data offset"
 msgstr "%s: el cramfs és invàlid, hi ha un desplaçament invàlid de les dades dels fitxers\n"
 
-#: disk-utils/fsck.cramfs.c:681 disk-utils/mkfs.cramfs.c:720
+#: disk-utils/fsck.cramfs.c:678 disk-utils/mkfs.cramfs.c:720
 #, fuzzy
 msgid "invalid blocksize argument"
 msgstr "umount: %s: dispositiu de blocs no vàlid"
 
-#: disk-utils/fsck.cramfs.c:702
+#: disk-utils/fsck.cramfs.c:699
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcte\n"
@@ -2328,31 +2355,31 @@ msgstr "Esteu segur de voler continuar?"
 msgid "check aborted.\n"
 msgstr "s'ha avortat la comprovació.\n"
 
-#: disk-utils/fsck.minix.c:309 disk-utils/fsck.minix.c:330
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:340
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Número de zona < FIRSTZONE en el fitxer «%s»."
 
-#: disk-utils/fsck.minix.c:312 disk-utils/fsck.minix.c:333
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:343
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Número de zona >= ZONES en el fitxer «%s»."
 
-#: disk-utils/fsck.minix.c:316 disk-utils/fsck.minix.c:337
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:347
 msgid "Remove block"
 msgstr "Elimina el bloc"
 
-#: disk-utils/fsck.minix.c:353
+#: disk-utils/fsck.minix.c:363
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "S'ha produït un error de lectura: no es pot cercar el bloc al fitxer «%s»\n"
 
-#: disk-utils/fsck.minix.c:359
+#: disk-utils/fsck.minix.c:369
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "S'ha produït un error de lectura: bloc erroni al fitxer «%s»\n"
 
-#: disk-utils/fsck.minix.c:371
+#: disk-utils/fsck.minix.c:381
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -2361,129 +2388,139 @@ msgstr ""
 "S'ha produït un error intern: s'està intentant escriure un bloc erroni\n"
 "S'ha ignorat la petició d'escriptura\n"
 
-#: disk-utils/fsck.minix.c:377
+#: disk-utils/fsck.minix.c:387
 msgid "seek failed in write_block"
 msgstr "s'ha produït un error en fer una cerca en write_block"
 
-#: disk-utils/fsck.minix.c:380
+#: disk-utils/fsck.minix.c:390
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "S'ha produït un error d'escriptura: hi ha un bloc incorrecte al fitxer «%s»\n"
 
-#: disk-utils/fsck.minix.c:495
+#: disk-utils/fsck.minix.c:505
 msgid "seek failed in write_super_block"
 msgstr "s'ha produït un error en fer una cerca en write_super_block"
 
-#: disk-utils/fsck.minix.c:497
+#: disk-utils/fsck.minix.c:507
 msgid "unable to write super-block"
 msgstr "no es pot escriure el superbloc"
 
-#: disk-utils/fsck.minix.c:510
+#: disk-utils/fsck.minix.c:520
 msgid "Unable to write inode map"
 msgstr "No es pot escriure el mapa de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:523
 msgid "Unable to write zone map"
 msgstr "No es pot escriure el mapa de zona"
 
-#: disk-utils/fsck.minix.c:516
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inodes"
 msgstr "No es poden escriure els nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:558
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "no s'ha pogut assignar memòria intermèdia per als mapes"
 
-#: disk-utils/fsck.minix.c:551
+#: disk-utils/fsck.minix.c:561
 msgid "unable to read super block"
 msgstr "no es pot llegir el superbloc"
 
-#: disk-utils/fsck.minix.c:573
+#: disk-utils/fsck.minix.c:583
 msgid "bad magic number in super-block"
 msgstr "número màgic incorrecte en el superbloc"
 
-#: disk-utils/fsck.minix.c:575
+#: disk-utils/fsck.minix.c:585
 msgid "Only 1k blocks/zones supported"
 msgstr "Només es suporten blocs o zones de 1k"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:587
+#, fuzzy
+msgid "bad s_ninodes field in super-block"
+msgstr "Camp s_imap_blocks incorrecte al superbloc"
+
+#: disk-utils/fsck.minix.c:589
 msgid "bad s_imap_blocks field in super-block"
 msgstr "Camp s_imap_blocks incorrecte al superbloc"
 
-#: disk-utils/fsck.minix.c:580
+#: disk-utils/fsck.minix.c:591
+#, fuzzy
+msgid "bad s_firstdatazone field in super-block"
+msgstr "Camp s_imap_blocks incorrecte al superbloc"
+
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "Camp s_zmap_blocks incorrecte en el superbloc"
 
-#: disk-utils/fsck.minix.c:596
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "No es pot assignar memòria intermèdia per al mapa de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr "No es pot assignar memòria intermèdia per al mapa de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:602
+#: disk-utils/fsck.minix.c:616
 msgid "Unable to allocate buffer for inodes"
 msgstr "No es pot assignar memòria intermèdia per als nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:619
 msgid "Unable to allocate buffer for inode count"
 msgstr "No es pot assignar memòria intermèdia per al nombre de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:622
 msgid "Unable to allocate buffer for zone count"
 msgstr "No es pot assignar memòria intermèdia per al nombre de zones"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:626
 msgid "Unable to read inode map"
 msgstr "No es pot llegir el mapa de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:630
 msgid "Unable to read zone map"
 msgstr "No es pot llegir el mapa de zones"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:634
 msgid "Unable to read inodes"
 msgstr "No es poden llegir els nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:622
+#: disk-utils/fsck.minix.c:636
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Atenció: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:641
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld nodes d'identificació\n"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:642
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocs\n"
 
-#: disk-utils/fsck.minix.c:629 disk-utils/mkfs.minix.c:566
+#: disk-utils/fsck.minix.c:643 disk-utils/mkfs.minix.c:566
 #, fuzzy, c-format
 msgid "Firstdatazone=%jd (%jd)\n"
 msgstr "Primera zona de dades=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:631
+#: disk-utils/fsck.minix.c:645
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Mida de la zona=%d\n"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:646
 #, fuzzy, c-format
 msgid "Maxsize=%zu\n"
 msgstr "Mida màxima=%ld\n"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estat del sistema de fitxers=%d\n"
 
-#: disk-utils/fsck.minix.c:635
+#: disk-utils/fsck.minix.c:649
 #, fuzzy, c-format
 msgid ""
 "namelen=%zd\n"
@@ -2492,161 +2529,166 @@ msgstr ""
 "longitud del nom=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:650 disk-utils/fsck.minix.c:700
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:714
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "El node d'identificació %d està marcat com a no usat, però és usat pel fitxer «%s»\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:703
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:717
 msgid "Mark in use"
 msgstr "Marca'l en ús"
 
-#: disk-utils/fsck.minix.c:675 disk-utils/fsck.minix.c:723
+#: disk-utils/fsck.minix.c:689 disk-utils/fsck.minix.c:737
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "El fitxer «%s» té el mode %05o\n"
 
-#: disk-utils/fsck.minix.c:682 disk-utils/fsck.minix.c:729
+#: disk-utils/fsck.minix.c:696 disk-utils/fsck.minix.c:743
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Avís: el nombre de nodes d'identificació és massa gran.\n"
 
-#: disk-utils/fsck.minix.c:741 disk-utils/fsck.minix.c:749
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:763
 msgid "root inode isn't a directory"
 msgstr "el node d'identificació arrel no és un directori"
 
-#: disk-utils/fsck.minix.c:761 disk-utils/fsck.minix.c:792
+#: disk-utils/fsck.minix.c:775 disk-utils/fsck.minix.c:806
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "El bloc ja ha estat emprat anteriorment. Ara està en el fitxer \"%s\"."
 
-#: disk-utils/fsck.minix.c:763 disk-utils/fsck.minix.c:794
-#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1132
-#: disk-utils/fsck.minix.c:1179 disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
+#: disk-utils/fsck.minix.c:1143 disk-utils/fsck.minix.c:1152
+#: disk-utils/fsck.minix.c:1199 disk-utils/fsck.minix.c:1208
 msgid "Clear"
 msgstr "Neteja"
 
-#: disk-utils/fsck.minix.c:773 disk-utils/fsck.minix.c:804
+#: disk-utils/fsck.minix.c:787 disk-utils/fsck.minix.c:818
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "El bloc %d en el fitxer `%s' està marcat com a no usat."
 
-#: disk-utils/fsck.minix.c:775 disk-utils/fsck.minix.c:806
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 msgid "Correct"
 msgstr "Corregeix"
 
-#: disk-utils/fsck.minix.c:945 disk-utils/fsck.minix.c:1019
+#: disk-utils/fsck.minix.c:959 disk-utils/fsck.minix.c:1033
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "El directori `%s' conté un nombre de nodes d'identificació incorrecte per al fitxer «%.*s»."
 
-#: disk-utils/fsck.minix.c:947 disk-utils/fsck.minix.c:1021
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1035
 msgid " Remove"
 msgstr " Elimina"
 
-#: disk-utils/fsck.minix.c:963 disk-utils/fsck.minix.c:1037
+#: disk-utils/fsck.minix.c:977 disk-utils/fsck.minix.c:1051
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: directori incorrecte: «.» no és el primer\n"
 
-#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1046
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1060
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: directori incorrecte: «..» no és el segon\n"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1097
+#: disk-utils/fsck.minix.c:1094 disk-utils/fsck.minix.c:1117
 msgid "internal error"
 msgstr "error intern"
 
-#: disk-utils/fsck.minix.c:1083 disk-utils/fsck.minix.c:1100
+#: disk-utils/fsck.minix.c:1097 disk-utils/fsck.minix.c:1120
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: directori incorrecte: mida < 32"
 
-#: disk-utils/fsck.minix.c:1112
+#: disk-utils/fsck.minix.c:1103
+#, fuzzy, c-format
+msgid "%s: bad directory: invalid i_zone, use --repair to fix\n"
+msgstr "%s: directori incorrecte: «.» no és el primer\n"
+
+#: disk-utils/fsck.minix.c:1132
 msgid "seek failed in bad_zone"
 msgstr "s'ha produït un error en cercar a bad_zone"
 
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1178
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1198
 #, fuzzy, c-format
 msgid "Inode %lu mode not cleared."
 msgstr "No s'ha esborrat el mode del node d'identificació %d."
 
-#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1187
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1207
 #, fuzzy, c-format
 msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "El node d'identificació %d no s'usa; s'ha marcat com a usat en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1193
+#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
 #, fuzzy, c-format
 msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "S'està usant el node d'identificació %d; marcat com a en desús en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1158 disk-utils/fsck.minix.c:1214
 msgid "Set"
 msgstr "Estableix"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1218
 #, fuzzy, c-format
 msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Node d'identificació %d (mode = %07o), i_nlinks=%d, comptats=%d."
 
-#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1201
+#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1221
 msgid "Set i_nlinks to count"
 msgstr "Estableix i_nlinks als comptats"
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1233
 #, fuzzy, c-format
 msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zona %d: marcada com a en ús; cap fitxer no l'utilitza."
 
-#: disk-utils/fsck.minix.c:1159 disk-utils/fsck.minix.c:1215
+#: disk-utils/fsck.minix.c:1179 disk-utils/fsck.minix.c:1235
 msgid "Unmark"
 msgstr "Elimina la marca"
 
-#: disk-utils/fsck.minix.c:1164 disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
 #, fuzzy, c-format
 msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zona %d: en ús, comptada=%d\n"
 
-#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1223
+#: disk-utils/fsck.minix.c:1187 disk-utils/fsck.minix.c:1243
 #, fuzzy, c-format
 msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zona %d: no en ús, comptada=%d\n"
 
-#: disk-utils/fsck.minix.c:1271
+#: disk-utils/fsck.minix.c:1291
 msgid "bad inode size"
 msgstr "mida de node d'identificació incorrecte"
 
-#: disk-utils/fsck.minix.c:1273
+#: disk-utils/fsck.minix.c:1293
 msgid "bad v2 inode size"
 msgstr "mida de node d'identificació v2 incorrecte"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1337
 msgid "need terminal for interactive repairs"
 msgstr "es necessita un terminal per a reparacions interactives"
 
-#: disk-utils/fsck.minix.c:1322
+#: disk-utils/fsck.minix.c:1341
 #, fuzzy, c-format
 msgid "cannot open %s: %s"
 msgstr "%s no es pot obrir"
 
-#: disk-utils/fsck.minix.c:1333
+#: disk-utils/fsck.minix.c:1352
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s està net; no es comprova.\n"
 
-#: disk-utils/fsck.minix.c:1336
+#: disk-utils/fsck.minix.c:1355
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "S'està forçant la comprovació del sistema de fitxers a %s.\n"
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kernel/sched/loadavg.c
  *
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 0af5ca9e3e3f..3c96c80e0992 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Real-Time Scheduling Class (mapped to the SCHED_FIFO and SCHED_RR
  * policies)
diff --git a/kernel/sched/sched-pelt.h b/kernel/sched/sched-pelt.h
index cd200d16529e..a26473674fb7 100644
--- a/kernel/sched/sched-pelt.h
+++ b/kernel/sched/sched-pelt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Generated by Documentation/scheduler/sched-pelt; do not modify. */
 
 static const u32 runnable_avg_yN_inv[] = {
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 14db76cd496f..3b448ba82225 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/sched.h>
 #include <linux/sched/autogroup.h>
diff --git a/kernel/sched/stats.c b/kernel/sched/stats.c
index 87e2c9f0c33e..940b1fa1d2ce 100644
--- a/kernel/sched/stats.c
+++ b/kernel/sched/stats.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/slab.h>
 #include <linux/fs.h>
diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h
index d5710651043b..baf500d12b7c 100644
--- a/kernel/sched/stats.h
+++ b/kernel/sched/stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifdef CONFIG_SCHEDSTATS
 
diff --git a/kernel/sched/stop_task.c b/kernel/sched/stop_task.c
index 9f69fb630853..45caf90b24cd 100644
--- a/kernel/sched/stop_task.c
+++ b/kernel/sched/stop_task.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "sched.h"
 
 /*
diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c
index 2227e183e202..9ff1555341ed 100644
--- a/kernel/sched/swait.c
+++ b/kernel/sched/swait.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sched/signal.h>
 #include <linux/swait.h>
 
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index f1cf4f306a82..6798276d29af 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Scheduler topology setup/handling methods
  */
diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index 8ac79355915b..5f0dfb2abb8d 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/seccomp.c
  *
diff --git a/kernel/signal.c b/kernel/signal.c
index 800a18f77732..8dcd8825b2de 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2698,7 +2698,7 @@ enum siginfo_layout siginfo_layout(int sig, int si_code)
 			[SIGSEGV] = { NSIGSEGV, SIL_FAULT },
 			[SIGBUS]  = { NSIGBUS,  SIL_FAULT },
 			[SIGTRAP] = { NSIGTRAP, SIL_FAULT },
-#if defined(SIGMET) && defined(NSIGEMT)
+#if defined(SIGEMT) && defined(NSIGEMT)
 			[SIGEMT]  = { NSIGEMT,  SIL_FAULT },
 #endif
 			[SIGCHLD] = { NSIGCHLD, SIL_CHLD },
diff --git a/kernel/smpboot.h b/kernel/smpboot.h
index 485b81cfab34..34dd3d7ba40b 100644
--- a/kernel/smpboot.h
+++ b/kernel/smpboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SMPBOOT_H
 #define SMPBOOT_H
 
diff --git a/kernel/sys.c b/kernel/sys.c
index 9aebc2935013..524a4cb9bbe2 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/kernel/sys.c
  *
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 8acef8576ce9..b5189762d275 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/linkage.h>
 #include <linux/errno.h>
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 58ea8c03662e..e8c0dab4fd65 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/stat.h>
 #include <linux/sysctl.h>
 #include "../fs/xfs/xfs_sysctl.h"
diff --git a/kernel/task_work.c b/kernel/task_work.c
index 9a9f262fc53d..0fef395662a6 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/spinlock.h>
 #include <linux/task_work.h>
 #include <linux/tracehook.h>
diff --git a/kernel/time/Makefile b/kernel/time/Makefile
index 938dbf33ef49..f1e46f338a9c 100644
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += time.o timer.o hrtimer.o
 obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o
 obj-y += timeconv.o timecounter.o alarmtimer.o
diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index 2ef98a02376a..f26acef5d7b4 100644
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/itimer.c
  *
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index edf19cc53140..99e03bec68e4 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NTP state machine interfaces and logic.
  *
diff --git a/kernel/time/ntp_internal.h b/kernel/time/ntp_internal.h
index d8a7c11fa71a..0a53e6ea47b1 100644
--- a/kernel/time/ntp_internal.h
+++ b/kernel/time/ntp_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NTP_INTERNAL_H
 #define _LINUX_NTP_INTERNAL_H
 
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 8585ad6e472a..5b117110b55b 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implement CPU time clocks for the POSIX clock interface.
  */
diff --git a/kernel/time/posix-timers.h b/kernel/time/posix-timers.h
index fb303c3be4d3..151e28f5bf30 100644
--- a/kernel/time/posix-timers.h
+++ b/kernel/time/posix-timers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define TIMER_RETRY 1
 
 struct k_clock {
diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c
index a7bb8f33ae07..58045eb976c3 100644
--- a/kernel/time/tick-broadcast-hrtimer.c
+++ b/kernel/time/tick-broadcast-hrtimer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/time/tick-broadcast-hrtimer.c
  * This file emulates a local clock event device
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index be0ac01f2e12..f8e1845aa464 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * tick internal variable and functions used by low/high res code
  */
diff --git a/kernel/time/tick-sched.h b/kernel/time/tick-sched.h
index 075444e3d48e..954b43dbf21c 100644
--- a/kernel/time/tick-sched.h
+++ b/kernel/time/tick-sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TICK_SCHED_H
 #define _TICK_SCHED_H
 
diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h
index d0914676d4c5..c9f9af339914 100644
--- a/kernel/time/timekeeping.h
+++ b/kernel/time/timekeeping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _KERNEL_TIME_TIMEKEEPING_H
 #define _KERNEL_TIME_TIMEKEEPING_H
 /*
diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
index 9a18f121f399..fdbeeb02dde9 100644
--- a/kernel/time/timekeeping_internal.h
+++ b/kernel/time/timekeeping_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TIMEKEEPING_INTERNAL_H
 #define _TIMEKEEPING_INTERNAL_H
 /*
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
index 90f2701d92a7..19a15b2f1190 100644
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 # Do not instrument the tracer itself:
 
diff --git a/kernel/trace/power-traces.c b/kernel/trace/power-traces.c
index 0c7dee221dca..21bb161c2316 100644
--- a/kernel/trace/power-traces.c
+++ b/kernel/trace/power-traces.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Power trace points
  *
diff --git a/kernel/trace/rpm-traces.c b/kernel/trace/rpm-traces.c
index 4b3b5eaf94d1..25dec0b00280 100644
--- a/kernel/trace/rpm-traces.c
+++ b/kernel/trace/rpm-traces.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Power trace points
  *
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 9050c8b3ccde..6b0b343a36a2 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _LINUX_KERNEL_TRACE_H
 #define _LINUX_KERNEL_TRACE_H
diff --git a/kernel/trace/trace_benchmark.c b/kernel/trace/trace_benchmark.c
index 16a8cf02eee9..79f838a75077 100644
--- a/kernel/trace/trace_benchmark.c
+++ b/kernel/trace/trace_benchmark.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/kthread.h>
diff --git a/kernel/trace/trace_benchmark.h b/kernel/trace/trace_benchmark.h
index ebdbfc2f2a64..be1d86ff753d 100644
--- a/kernel/trace/trace_benchmark.h
+++ b/kernel/trace/trace_benchmark.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM benchmark
 
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index 4d8fdf3184dc..4ad967453b6f 100644
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * unlikely profiler
  *
diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index adcdbbeae010..e954ae3d82c0 100644
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file defines the trace event structures that go into the ring
  * buffer directly. They are created via macros so that changes for them
diff --git a/kernel/trace/trace_events_filter_test.h b/kernel/trace/trace_events_filter_test.h
index bfd4dba0d603..39d7ef4f57cb 100644
--- a/kernel/trace/trace_events_filter_test.h
+++ b/kernel/trace/trace_events_filter_test.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM test
 
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index 39aa7aa66468..548e62eb5c46 100644
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * trace_export.c - export basic ftrace utilities to user space
  *
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index a0910c0cdf2e..27f7ad12c4b1 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ring buffer based function tracer
  *
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index b8f1f54731af..23c0b0cb5fb9 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  * Function graph tracer.
diff --git a/kernel/trace/trace_kdb.c b/kernel/trace/trace_kdb.c
index 57149bce6aad..d953c163a079 100644
--- a/kernel/trace/trace_kdb.c
+++ b/kernel/trace/trace_kdb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kdb helper for dumping the ftrace buffer
  *
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
index dca78fc48439..b0388016b687 100644
--- a/kernel/trace/trace_mmiotrace.c
+++ b/kernel/trace/trace_mmiotrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Memory mapped I/O tracing
  *
diff --git a/kernel/trace/trace_nop.c b/kernel/trace/trace_nop.c
index 49f61fe96a6b..50523f953a5d 100644
--- a/kernel/trace/trace_nop.c
+++ b/kernel/trace/trace_nop.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * nop tracer
  *
diff --git a/kernel/trace/trace_output.h b/kernel/trace/trace_output.h
index fabc49bcd493..dbba03ed96de 100644
--- a/kernel/trace/trace_output.h
+++ b/kernel/trace/trace_output.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TRACE_EVENTS_H
 #define __TRACE_EVENTS_H
 
diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index b341c02730be..e288168661e1 100644
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * trace context switch
  *
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index 0c331978b1a6..7d461dcd4831 100644
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * trace task wakeup timings
  *
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index b17ec642793b..cd70eb5df38e 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Include in trace.c */
 
 #include <uapi/linux/sched/types.h>
diff --git a/kernel/trace/trace_selftest_dynamic.c b/kernel/trace/trace_selftest_dynamic.c
index b4c475a0a48b..8cda06a10d66 100644
--- a/kernel/trace/trace_selftest_dynamic.c
+++ b/kernel/trace/trace_selftest_dynamic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "trace.h"
 
 int DYN_FTRACE_TEST_NAME(void)
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 780262210c9a..734accc02418 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2008 Steven Rostedt <srostedt@redhat.com>
  *
diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index 413ff108fbd0..75bf1bcb4a8a 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Infrastructure for statistic tracing (histogram output).
  *
diff --git a/kernel/trace/trace_stat.h b/kernel/trace/trace_stat.h
index 8f03914b9a6a..76d30b4ebe83 100644
--- a/kernel/trace/trace_stat.h
+++ b/kernel/trace/trace_stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TRACE_STAT_H
 #define __TRACE_STAT_H
 
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 696afe72d3b1..a2a642f2c64f 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <trace/syscall.h>
 #include <trace/events/syscalls.h>
 #include <linux/syscalls.h>
diff --git a/kernel/trace/tracing_map.h b/kernel/trace/tracing_map.h
index 618838f5f30a..ab0ca77331d0 100644
--- a/kernel/trace/tracing_map.h
+++ b/kernel/trace/tracing_map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TRACING_MAP_H
 #define __TRACING_MAP_H
 
diff --git a/kernel/uid16.c b/kernel/uid16.c
index 5c2dc5b2bf4f..ce74a4901d2b 100644
--- a/kernel/uid16.c
+++ b/kernel/uid16.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Wrapper functions for 16bit uid back compatibility. All nicely tied
  *	together in the faint hope we can take the out in five years time.
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 6bcb854909c0..c8e06703e44c 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Detect hard and soft lockups on a system
  *
diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_hld.c
index 71a62ceacdc8..e449a23e9d59 100644
--- a/kernel/watchdog_hld.c
+++ b/kernel/watchdog_hld.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Detect hard lockups on a system
  *
@@ -12,6 +13,7 @@
 #define pr_fmt(fmt) "NMI watchdog: " fmt
 
 #include <linux/nmi.h>
+#include <linux/atomic.h>
 #include <linux/module.h>
 #include <linux/sched/debug.h>
 
@@ -21,10 +23,11 @@
 static DEFINE_PER_CPU(bool, hard_watchdog_warn);
 static DEFINE_PER_CPU(bool, watchdog_nmi_touch);
 static DEFINE_PER_CPU(struct perf_event *, watchdog_ev);
+static DEFINE_PER_CPU(struct perf_event *, dead_event);
 static struct cpumask dead_events_mask;
 
 static unsigned long hardlockup_allcpu_dumped;
-static unsigned int watchdog_cpus;
+static atomic_t watchdog_cpus = ATOMIC_INIT(0);
 
 void arch_touch_nmi_watchdog(void)
 {
@@ -188,7 +191,8 @@ void hardlockup_detector_perf_enable(void)
 	if (hardlockup_detector_event_create())
 		return;
 
-	if (!watchdog_cpus++)
+	/* use original value for check */
+	if (!atomic_fetch_inc(&watchdog_cpus))
 		pr_info("Enabled. Permanently consumes one hw-PMU counter.\n");
 
 	perf_event_enable(this_cpu_read(watchdog_ev));
@@ -203,8 +207,10 @@ void hardlockup_detector_perf_disable(void)
 
 	if (event) {
 		perf_event_disable(event);
+		this_cpu_write(watchdog_ev, NULL);
+		this_cpu_write(dead_event, event);
 		cpumask_set_cpu(smp_processor_id(), &dead_events_mask);
-		watchdog_cpus--;
+		atomic_dec(&watchdog_cpus);
 	}
 }
 
@@ -218,7 +224,7 @@ void hardlockup_detector_perf_cleanup(void)
 	int cpu;
 
 	for_each_cpu(cpu, &dead_events_mask) {
-		struct perf_event *event = per_cpu(watchdog_ev, cpu);
+		struct perf_event *event = per_cpu(dead_event, cpu);
 
 		/*
 		 * Required because for_each_cpu() reports  unconditionally
@@ -226,7 +232,7 @@ void hardlockup_detector_perf_cleanup(void)
 		 */
 		if (event)
 			perf_event_release_kernel(event);
-		per_cpu(watchdog_ev, cpu) = NULL;
+		per_cpu(dead_event, cpu) = NULL;
 	}
 	cpumask_clear(&dead_events_mask);
 }
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 160fdc6e839a..1070b21ba4aa 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -68,6 +68,7 @@ enum {
 	 * attach_mutex to avoid changing binding state while
 	 * worker_attach_to_pool() is in progress.
 	 */
+	POOL_MANAGER_ACTIVE	= 1 << 0,	/* being managed */
 	POOL_DISASSOCIATED	= 1 << 2,	/* cpu can't serve workers */
 
 	/* worker flags */
@@ -165,7 +166,6 @@ struct worker_pool {
 						/* L: hash of busy workers */
 
 	/* see manage_workers() for details on the two manager mutexes */
-	struct mutex		manager_arb;	/* manager arbitration */
 	struct worker		*manager;	/* L: purely informational */
 	struct mutex		attach_mutex;	/* attach/detach exclusion */
 	struct list_head	workers;	/* A: attached workers */
@@ -299,6 +299,7 @@ static struct workqueue_attrs *wq_update_unbound_numa_attrs_buf;
 
 static DEFINE_MUTEX(wq_pool_mutex);	/* protects pools and workqueues list */
 static DEFINE_SPINLOCK(wq_mayday_lock);	/* protects wq->maydays list */
+static DECLARE_WAIT_QUEUE_HEAD(wq_manager_wait); /* wait for manager to go away */
 
 static LIST_HEAD(workqueues);		/* PR: list of all workqueues */
 static bool workqueue_freezing;		/* PL: have wqs started freezing? */
@@ -801,7 +802,7 @@ static bool need_to_create_worker(struct worker_pool *pool)
 /* Do we have too many workers and should some go away? */
 static bool too_many_workers(struct worker_pool *pool)
 {
-	bool managing = mutex_is_locked(&pool->manager_arb);
+	bool managing = pool->flags & POOL_MANAGER_ACTIVE;
 	int nr_idle = pool->nr_idle + managing; /* manager is considered idle */
 	int nr_busy = pool->nr_workers - nr_idle;
 
@@ -1980,24 +1981,17 @@ static bool manage_workers(struct worker *worker)
 {
 	struct worker_pool *pool = worker->pool;
 
-	/*
-	 * Anyone who successfully grabs manager_arb wins the arbitration
-	 * and becomes the manager.  mutex_trylock() on pool->manager_arb
-	 * failure while holding pool->lock reliably indicates that someone
-	 * else is managing the pool and the worker which failed trylock
-	 * can proceed to executing work items.  This means that anyone
-	 * grabbing manager_arb is responsible for actually performing
-	 * manager duties.  If manager_arb is grabbed and released without
-	 * actual management, the pool may stall indefinitely.
-	 */
-	if (!mutex_trylock(&pool->manager_arb))
+	if (pool->flags & POOL_MANAGER_ACTIVE)
 		return false;
+
+	pool->flags |= POOL_MANAGER_ACTIVE;
 	pool->manager = worker;
 
 	maybe_create_worker(pool);
 
 	pool->manager = NULL;
-	mutex_unlock(&pool->manager_arb);
+	pool->flags &= ~POOL_MANAGER_ACTIVE;
+	wake_up(&wq_manager_wait);
 	return true;
 }
 
@@ -3235,7 +3229,6 @@ static int init_worker_pool(struct worker_pool *pool)
 	setup_timer(&pool->mayday_timer, pool_mayday_timeout,
 		    (unsigned long)pool);
 
-	mutex_init(&pool->manager_arb);
 	mutex_init(&pool->attach_mutex);
 	INIT_LIST_HEAD(&pool->workers);
 
@@ -3305,13 +3298,15 @@ static void put_unbound_pool(struct worker_pool *pool)
 	hash_del(&pool->hash_node);
 
 	/*
-	 * Become the manager and destroy all workers.  Grabbing
-	 * manager_arb prevents @pool's workers from blocking on
-	 * attach_mutex.
+	 * Become the manager and destroy all workers.  This prevents
+	 * @pool's workers from blocking on attach_mutex.  We're the last
+	 * manager and @pool gets freed with the flag set.
 	 */
-	mutex_lock(&pool->manager_arb);
-
 	spin_lock_irq(&pool->lock);
+	wait_event_lock_irq(wq_manager_wait,
+			    !(pool->flags & POOL_MANAGER_ACTIVE), pool->lock);
+	pool->flags |= POOL_MANAGER_ACTIVE;
+
 	while ((worker = first_idle_worker(pool)))
 		destroy_worker(worker);
 	WARN_ON(pool->nr_workers || pool->nr_idle);
@@ -3325,8 +3320,6 @@ static void put_unbound_pool(struct worker_pool *pool)
 	if (pool->detach_completion)
 		wait_for_completion(pool->detach_completion);
 
-	mutex_unlock(&pool->manager_arb);
-
 	/* shut down the timers */
 	del_timer_sync(&pool->idle_timer);
 	del_timer_sync(&pool->mayday_timer);
diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h
index 8635417c587b..d390d1be3748 100644
--- a/kernel/workqueue_internal.h
+++ b/kernel/workqueue_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * kernel/workqueue_internal.h
  *
@@ -9,6 +10,7 @@
 
 #include <linux/workqueue.h>
 #include <linux/kthread.h>
+#include <linux/preempt.h>
 
 struct worker_pool;
 
@@ -59,7 +61,7 @@ struct worker {
  */
 static inline struct worker *current_wq_worker(void)
 {
-	if (current->flags & PF_WQ_WORKER)
+	if (in_task() && (current->flags & PF_WQ_WORKER))
 		return kthread_data(current);
 	return NULL;
 }