Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

34 files changed, 825 insertions, 143 deletions

diff --git a/upstream/fedora-40/man8/btrfs-balance.8 b/upstream/fedora-40/man8/btrfs-balance.8
index c30684c6..776609f9 100644
--- a/upstream/fedora-40/man8/btrfs-balance.8
+++ b/upstream/fedora-40/man8/btrfs-balance.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-BALANCE" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-BALANCE" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-balance \- balance block groups on a btrfs filesystem
 .SH SYNOPSIS
@@ -185,7 +185,7 @@ or \fIraid6\fP
 .INDENT 7.0
 .TP
 .B \-\-background|\-\-bg
-run the balance operation asynchronously in the background, uses \fBfork(2)\fP to
+run the balance operation asynchronously in the background, uses \fI\%fork(2)\fP to
 start the process that calls the kernel ioctl
 .UNINDENT
 .INDENT 7.0
diff --git a/upstream/fedora-40/man8/btrfs-check.8 b/upstream/fedora-40/man8/btrfs-check.8
index 59d0a764..123ec090 100644
--- a/upstream/fedora-40/man8/btrfs-check.8
+++ b/upstream/fedora-40/man8/btrfs-check.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-CHECK" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-CHECK" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-check \- check or repair a btrfs filesystem
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-convert.8 b/upstream/fedora-40/man8/btrfs-convert.8
index fded5087..12d0cf51 100644
--- a/upstream/fedora-40/man8/btrfs-convert.8
+++ b/upstream/fedora-40/man8/btrfs-convert.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-CONVERT" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-CONVERT" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-convert \- convert from ext2/3/4 or reiserfs filesystem to btrfs in-place
 .SH SYNOPSIS
@@ -76,6 +76,16 @@ have a supported data block size (i.e. the same that would be valid for
 \fBmkfs.btrfs\fP). This is typically the system page size (4KiB on x86_64
 machines).
 .sp
+\fBNOTE:\fP
+.INDENT 0.0
+.INDENT 3.5
+Always consider if a mkfs and file copy would not be a better option than
+the in\-place conversion given what was said above. The conversion depends on
+3rd party libraries and the other filesystems could still evolve and add new
+features. Not all combinations are covered or tested.
+.UNINDENT
+.UNINDENT
+.sp
 \fBBEFORE YOU START\fP
 .sp
 The source filesystem must be clean, e.g. no journal to replay or no repairs
diff --git a/upstream/fedora-40/man8/btrfs-device.8 b/upstream/fedora-40/man8/btrfs-device.8
index 5789f4fa..5025424c 100644
--- a/upstream/fedora-40/man8/btrfs-device.8
+++ b/upstream/fedora-40/man8/btrfs-device.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-DEVICE" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-DEVICE" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-device \- manage devices of btrfs filesystems
 .SH SYNOPSIS
@@ -186,9 +186,9 @@ $ btrfs device remove /dev/sda /mnt
 Add device(s) to the filesystem identified by \fIpath\fP\&.
 .sp
 If applicable, a whole device discard (TRIM) operation is performed prior to
-adding the device. A device with existing filesystem detected by \fBblkid(8)\fP
+adding the device. A device with existing filesystem detected by \fI\%blkid(8)\fP
 will prevent device addition and has to be forced. Alternatively the filesystem
-can be wiped from the device using e.g. the \fBwipefs(8)\fP tool.
+can be wiped from the device using e.g. the \fI\%wipefs(8)\fP tool.
 .sp
 The operation is instant and does not affect existing data. The operation merely
 adds the device to the filesystem structures and creates some block groups
diff --git a/upstream/fedora-40/man8/btrfs-filesystem.8 b/upstream/fedora-40/man8/btrfs-filesystem.8
index f73467d9..ca7e8469 100644
--- a/upstream/fedora-40/man8/btrfs-filesystem.8
+++ b/upstream/fedora-40/man8/btrfs-filesystem.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-FILESYSTEM" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-FILESYSTEM" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-filesystem \- command group that primarily does work on the whole filesystems
 .SH SYNOPSIS
@@ -292,7 +292,7 @@ Subvolume containing a swapfile cannot be snapshotted and blocks of an
 activated swapfile cannot be balanced.
 .sp
 Swapfile creation can be achieved by standalone commands too. Activation
-needs to be done by command \fBswapon(8)\fP\&. See also command
+needs to be done by command \fI\%swapon(8)\fP\&. See also command
 \fBbtrfs inspect\-internal map\-swapfile\fP
 and the \fI\%Swapfile feature\fP description.
 .sp
@@ -348,7 +348,7 @@ The resize command does not manipulate the size of underlying
 partition.  If you wish to enlarge/reduce a filesystem, you must make sure you
 can expand the partition before enlarging the filesystem and shrink the
 partition after reducing the size of the filesystem.  This can done using
-\fBfdisk(8)\fP or \fBparted(8)\fP to delete the existing partition and recreate
+\fI\%fdisk(8)\fP or \fI\%parted(8)\fP to delete the existing partition and recreate
 it with the new desired size.  When recreating the partition make sure to use
 the same starting partition offset as before.
 .sp
@@ -411,7 +411,7 @@ show sizes in TiB, or TB with \-\-si
 .UNINDENT
 .TP
 .B sync <path>
-Force a sync of the filesystem at \fIpath\fP, similar to the \fBsync(1)\fP command. In
+Force a sync of the filesystem at \fIpath\fP, similar to the \fI\%sync(1)\fP command. In
 addition, it starts cleaning of deleted subvolumes. To wait for the subvolume
 deletion to complete use the \fBbtrfs subvolume sync\fP command.
 .TP
diff --git a/upstream/fedora-40/man8/btrfs-find-root.8 b/upstream/fedora-40/man8/btrfs-find-root.8
index 4dd6969d..56461aed 100644
--- a/upstream/fedora-40/man8/btrfs-find-root.8
+++ b/upstream/fedora-40/man8/btrfs-find-root.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-FIND-ROOT" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-FIND-ROOT" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-find-root \- filter to find btrfs root
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-image.8 b/upstream/fedora-40/man8/btrfs-image.8
index c369ee4d..ae6f33af 100644
--- a/upstream/fedora-40/man8/btrfs-image.8
+++ b/upstream/fedora-40/man8/btrfs-image.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-IMAGE" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-IMAGE" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-image \- create/restore an image of the filesystem
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-inspect-internal.8 b/upstream/fedora-40/man8/btrfs-inspect-internal.8
index 25160caf..8f46083d 100644
--- a/upstream/fedora-40/man8/btrfs-inspect-internal.8
+++ b/upstream/fedora-40/man8/btrfs-inspect-internal.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-INSPECT-INTERNAL" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-INSPECT-INTERNAL" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-inspect-internal \- query various internal information
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-map-logical.8 b/upstream/fedora-40/man8/btrfs-map-logical.8
index c40866f1..dbc84b05 100644
--- a/upstream/fedora-40/man8/btrfs-map-logical.8
+++ b/upstream/fedora-40/man8/btrfs-map-logical.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-MAP-LOGICAL" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-MAP-LOGICAL" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-map-logical \- map btrfs logical extent to physical extent
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-property.8 b/upstream/fedora-40/man8/btrfs-property.8
index 1d7330d6..8e7f8fd2 100644
--- a/upstream/fedora-40/man8/btrfs-property.8
+++ b/upstream/fedora-40/man8/btrfs-property.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-PROPERTY" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-PROPERTY" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-property \- get/set/list properties for given filesystem object
 .SH SYNOPSIS
@@ -40,8 +40,8 @@ The object can be an inode (file or directory), subvolume or the whole
 filesystem.
 .sp
 \fBbtrfs property\fP provides an unified and user\-friendly method to tune different
-btrfs properties instead of using the traditional method like \fBchattr(1)\fP or
-\fBlsattr(1)\fP\&.
+btrfs properties instead of using the traditional method like \fI\%chattr(1)\fP or
+\fI\%lsattr(1)\fP\&.
 .SS Object types
 .sp
 A property might apply to several object types so in some cases it\(aqs necessary
@@ -174,7 +174,7 @@ returned in case of failure.
 .SH SEE ALSO
 .sp
 \fI\%mkfs.btrfs(8)\fP,
-\fBlsattr(1)\fP,
-\fBchattr(1)\fP
+\fI\%lsattr(1)\fP,
+\fI\%chattr(1)\fP
 .\" Generated by docutils manpage writer.
 .
diff --git a/upstream/fedora-40/man8/btrfs-qgroup.8 b/upstream/fedora-40/man8/btrfs-qgroup.8
index 71718ce5..1ab1f9bc 100644
--- a/upstream/fedora-40/man8/btrfs-qgroup.8
+++ b/upstream/fedora-40/man8/btrfs-qgroup.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-QGROUP" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-QGROUP" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-qgroup \- control the quota group of a btrfs filesystem
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-quota.8 b/upstream/fedora-40/man8/btrfs-quota.8
index e1181252..09f413fd 100644
--- a/upstream/fedora-40/man8/btrfs-quota.8
+++ b/upstream/fedora-40/man8/btrfs-quota.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-QUOTA" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-QUOTA" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-quota \- control the global quota status of a btrfs filesystem
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-receive.8 b/upstream/fedora-40/man8/btrfs-receive.8
index d206b010..e94c3e1b 100644
--- a/upstream/fedora-40/man8/btrfs-receive.8
+++ b/upstream/fedora-40/man8/btrfs-receive.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-RECEIVE" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-RECEIVE" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-receive \- receive subvolumes from send stream
 .SH SYNOPSIS
@@ -67,7 +67,7 @@ read the stream from \fIFILE\fP instead of stdin,
 .INDENT 0.0
 .TP
 .B \-C|\-\-chroot
-confine the process to \fIpath\fP using \fBchroot(1)\fP
+confine the process to \fIpath\fP using \fI\%chroot(1)\fP
 .UNINDENT
 .INDENT 0.0
 .TP
diff --git a/upstream/fedora-40/man8/btrfs-replace.8 b/upstream/fedora-40/man8/btrfs-replace.8
index d5bb007c..7fdc3f0f 100644
--- a/upstream/fedora-40/man8/btrfs-replace.8
+++ b/upstream/fedora-40/man8/btrfs-replace.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-REPLACE" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-REPLACE" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-replace \- replace devices managed by btrfs with other device
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-rescue.8 b/upstream/fedora-40/man8/btrfs-rescue.8
index 441e07c0..f2a8f305 100644
--- a/upstream/fedora-40/man8/btrfs-rescue.8
+++ b/upstream/fedora-40/man8/btrfs-rescue.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-RESCUE" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-RESCUE" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-rescue \- recover a damaged btrfs filesystem
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-restore.8 b/upstream/fedora-40/man8/btrfs-restore.8
index 79916614..c18d127f 100644
--- a/upstream/fedora-40/man8/btrfs-restore.8
+++ b/upstream/fedora-40/man8/btrfs-restore.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-RESTORE" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-RESTORE" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-restore \- try to restore files from a damaged filesystem image
 .SH SYNOPSIS
@@ -106,7 +106,7 @@ dry run (only list files that would be recovered)
 .INDENT 0.0
 .TP
 .BI \-\-path\-regex \ <regex>
-restore only filenames matching a regular expression (\fBregex(7)\fP)
+restore only filenames matching a regular expression (\fI\%regex(7)\fP)
 with a mandatory format
 .sp
 \fB^/(|home(|/username(|/Desktop(|/.*))))$\fP
diff --git a/upstream/fedora-40/man8/btrfs-scrub.8 b/upstream/fedora-40/man8/btrfs-scrub.8
index e415fac8..73cb1dde 100644
--- a/upstream/fedora-40/man8/btrfs-scrub.8
+++ b/upstream/fedora-40/man8/btrfs-scrub.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-SCRUB" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-SCRUB" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-scrub \- scrub btrfs filesystem, verify block checksums
 .SH SYNOPSIS
@@ -68,13 +68,13 @@ scrub only a selected device. See \fI\%btrfs scrub start\fP for more.
 \fBNOTE:\fP
 .INDENT 0.0
 .INDENT 3.5
-The \fBionice(1)\fP may not be generally supported by all IO schedulers and
+The \fI\%ionice(1)\fP may not be generally supported by all IO schedulers and
 the options to \fBbtrfs scrub start\fP may not work as expected.
 .UNINDENT
 .UNINDENT
 .sp
 In the past when the \fI\%CFQ IO scheduler\fP was generally used
-the \fBionice(1)\fP syscalls set the priority to \fIidle\fP so the IO would not
+the \fI\%ionice(1)\fP syscalls set the priority to \fIidle\fP so the IO would not
 interfere with regular IO. Since the kernel 5.0 the CFQ is not available.
 .sp
 The IO scheduler known to support that is \fI\%BFQ\fP, but first read the
@@ -91,7 +91,7 @@ belong to the same accounting group.
 .sp
 .nf
 .ft C
-$ systemd\-run \-p \(dqIOBandwidthReadMax=/dev/sdx 10M\(dq btrfs scrub start \-B /
+$ systemd\-run \-p \(dqIOReadBandwidthMax=/dev/sdx 10M\(dq btrfs scrub start \-B /
 .ft P
 .fi
 .UNINDENT
@@ -226,14 +226,14 @@ necessary
 .INDENT 7.0
 .TP
 .BI \-c \ <ioprio_class>
-set IO priority class (see \fBionice(1)\fP manual page) if the IO
+set IO priority class (see \fI\%ionice(1)\fP manual page) if the IO
 scheduler configured for the device supports ionice. This is
 only supported by BFQ or Kyber but is \fInot\fP supported by
 mq\-deadline. Please read the section about
 \fI\%IO limiting\fP\&.
 .TP
 .BI \-n \ <ioprio_classdata>
-set IO priority classdata (see \fBionice(1)\fP manpage)
+set IO priority classdata (see \fI\%ionice(1)\fP manpage)
 .TP
 .B  \-q
 (deprecated) alias for global \fI\-q\fP option
diff --git a/upstream/fedora-40/man8/btrfs-select-super.8 b/upstream/fedora-40/man8/btrfs-select-super.8
index cbf1079a..19b6b54a 100644
--- a/upstream/fedora-40/man8/btrfs-select-super.8
+++ b/upstream/fedora-40/man8/btrfs-select-super.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-SELECT-SUPER" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-SELECT-SUPER" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-select-super \- overwrite primary superblock with a backup copy
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-send.8 b/upstream/fedora-40/man8/btrfs-send.8
index 0f0ca7d8..c5c42189 100644
--- a/upstream/fedora-40/man8/btrfs-send.8
+++ b/upstream/fedora-40/man8/btrfs-send.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-SEND" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-SEND" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-send \- generate a stream of changes between two subvolume snapshots
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfs-subvolume.8 b/upstream/fedora-40/man8/btrfs-subvolume.8
index 1ac17e3e..cbab12f2 100644
--- a/upstream/fedora-40/man8/btrfs-subvolume.8
+++ b/upstream/fedora-40/man8/btrfs-subvolume.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-SUBVOLUME" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-SUBVOLUME" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs-subvolume \- manage btrfs subvolumes
 .SH SYNOPSIS
@@ -41,7 +41,8 @@ snapshots.
 A BTRFS subvolume is a part of filesystem with its own independent
 file/directory hierarchy and inode number namespace. Subvolumes can share file
 extents. A snapshot is also subvolume, but with a given initial content of the
-original subvolume. A subvolume has always inode number 256.
+original subvolume. A subvolume has always inode number 256 (see more in
+\fI\%Inode numbers (in Subvolumes)\fP).
 .sp
 \fBNOTE:\fP
 .INDENT 0.0
@@ -200,10 +201,28 @@ the 4th column:
 .UNINDENT
 .SH INODE NUMBERS
 .sp
-A proper subvolume has always inode number 256. If a subvolume is nested and
-then a snapshot is taken, then the cloned directory entry representing the
-subvolume becomes empty and the inode has number 2. All other files and
-directories in the target snapshot preserve their original inode numbers.
+A directory representing a subvolume has always inode number 256 (sometimes
+also called a root of the subvolume):
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ ls \-lis
+total 0
+389111 0 drwxr\-xr\-x 1 user users 0 Jan 20 12:13 dir
+389110 0 \-rw\-r\-\-r\-\- 1 user users 0 Jan 20 12:13 file
+   256 0 drwxr\-xr\-x 1 user users 0 Jan 20 12:13 snap1
+   256 0 drwxr\-xr\-x 1 user users 0 Jan 20 12:13 subv1
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+If a subvolume is nested and then a snapshot is taken, then the cloned
+directory entry representing the subvolume becomes empty and the inode has
+number 2. All other files and directories in the target snapshot preserve their
+original inode numbers.
 .sp
 \fBNOTE:\fP
 .INDENT 0.0
@@ -568,6 +587,6 @@ returned in case of failure.
 \fI\%btrfs\-quota(8)\fP,
 \fI\%btrfs\-send(8)\fP,
 \fI\%mkfs.btrfs(8)\fP,
-\fBmount(8)\fP
+\fI\%mount(8)\fP
 .\" Generated by docutils manpage writer.
 .
diff --git a/upstream/fedora-40/man8/btrfs.8 b/upstream/fedora-40/man8/btrfs.8
index f20beee4..d22baebd 100644
--- a/upstream/fedora-40/man8/btrfs.8
+++ b/upstream/fedora-40/man8/btrfs.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfs \- a toolbox to manage btrfs filesystems
 .SH SYNOPSIS
diff --git a/upstream/fedora-40/man8/btrfstune.8 b/upstream/fedora-40/man8/btrfstune.8
index 94cc266f..58df9cd3 100644
--- a/upstream/fedora-40/man8/btrfstune.8
+++ b/upstream/fedora-40/man8/btrfstune.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFSTUNE" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFSTUNE" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 btrfstune \- tune various filesystem parameters
 .SH SYNOPSIS
@@ -134,7 +134,7 @@ change operation in case it was interrupted.
 .BI \-U \ <UUID>
 Change fsid to \fIUUID\fP in all metadata blocks.
 .sp
-The \fIUUID\fP should be a 36 bytes string in \fBprintf(3)\fP format
+The \fIUUID\fP should be a 36 bytes string in \fI\%printf(3)\fP format
 \fB%08x\-%04x\-%04x\-%04x\-%012x\fP\&.
 If there is a previous unfinished fsid change, it will continue only if the
 \fIUUID\fP matches the unfinished one or if you use the option \fI\-u\fP\&.
diff --git a/upstream/fedora-40/man8/fsck.btrfs.8 b/upstream/fedora-40/man8/fsck.btrfs.8
index 02a04994..accf9bc5 100644
--- a/upstream/fedora-40/man8/fsck.btrfs.8
+++ b/upstream/fedora-40/man8/fsck.btrfs.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "FSCK.BTRFS" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "FSCK.BTRFS" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 fsck.btrfs \- do nothing, successfully
 .SH SYNOPSIS
@@ -37,7 +37,7 @@ fsck.btrfs \- do nothing, successfully
 .sp
 \fBfsck.btrfs\fP is a type of utility that should exist for any filesystem and is
 called during system setup when the corresponding \fB/etc/fstab\fP entries
-contain non\-zero value for \fIfs_passno\fP, see \fBfstab(5)\fP for more.
+contain non\-zero value for \fIfs_passno\fP, see \fI\%fstab(5)\fP for more.
 .sp
 Traditional filesystems need to run their respective fsck utility in case the
 filesystem was not unmounted cleanly and the log needs to be replayed before
@@ -68,7 +68,7 @@ Operational error, e.g. device does not exist
 .SH SEE ALSO
 .sp
 \fI\%btrfs(8)\fP,
-\fBfsck(8)\fP,
-\fBfstab(5)\fP
+\fI\%fsck(8)\fP,
+\fI\%fstab(5)\fP
 .\" Generated by docutils manpage writer.
 .
diff --git a/upstream/fedora-40/man8/gssd.8 b/upstream/fedora-40/man8/gssd.8
index 2a5384d3..c735eff6 100644
--- a/upstream/fedora-40/man8/gssd.8
+++ b/upstream/fedora-40/man8/gssd.8
@@ -346,6 +346,15 @@ flag.
 Equivalent to
 .BR -l .
 .TP
+.B allowed-enctypes
+Allows you to restrict
+.B rpc.gssd
+to using a subset of the encryption types permitted by the kernel and the krb5
+libraries.  This is useful if you need to interoperate with an NFS server that
+does not have support for the newer SHA2 and Camellia encryption types, for
+example.  This configuration file option does not have an equivalent
+command-line option.
+.TP
 .B context-timeout
 Equivalent to
 .BR -t .
diff --git a/upstream/fedora-40/man8/makepkg.8 b/upstream/fedora-40/man8/makepkg.8
index 997369c2..5e350588 100644
--- a/upstream/fedora-40/man8/makepkg.8
+++ b/upstream/fedora-40/man8/makepkg.8
@@ -2,12 +2,12 @@
 .\"     Title: makepkg
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-01-25
+.\"      Date: 2024-03-09
 .\"    Manual: Pacman Manual
-.\"    Source: Pacman 6.0.2
+.\"    Source: Pacman 6.1.0
 .\"  Language: English
 .\"
-.TH "MAKEPKG" "8" "2024\-01\-25" "Pacman 6\&.0\&.2" "Pacman Manual"
+.TH "MAKEPKG" "8" "2024\-03\-09" "Pacman 6\&.1\&.0" "Pacman Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -101,7 +101,7 @@ PKGDEST
 .PP
 \fB\-g, \-\-geninteg\fR
 .RS 4
-For each source file in the source array of PKGBUILD, download the file if required and generate integrity checks\&. The integrity checks generated are determined by the checks present in the PKGBUILD, falling back to the value of the INTEGRITY_CHECK array in makepkg\&.conf(5) if these are absent This output can be redirected into your PKGBUILD for source validation using "makepkg \-g >> PKGBUILD"\&.
+For each source file in the source array of PKGBUILD, download the file if required and generate integrity checks\&. The integrity checks generated are determined by the checks present in the PKGBUILD, falling back to the value of the INTEGRITY_CHECK array in makepkg\&.conf(5) if these are absent\&. This output can be redirected into your PKGBUILD for source validation using "makepkg \-g >> PKGBUILD"\&.
 .RE
 .PP
 \fB\-\-skipinteg\fR
@@ -198,6 +198,11 @@ Display version information\&.
 Remove the $srcdir before building the package\&.
 .RE
 .PP
+\fB\-D\fR <dir>, \fB\-\-dir\fR <dir>
+.RS 4
+Change to directory <dir> before reading the PKGBUILD or doing anything else\&.
+.RE
+.PP
 \fB\-\-allsource\fR
 .RS 4
 Do not actually build the package, but build a source\-only tarball that includes all sources, including those that are normally downloaded via makepkg\&. This is useful for passing a single tarball to another program such as a chroot or remote builder\&. It will also satisfy requirements of the GPL when distributing binary packages\&.
@@ -224,6 +229,11 @@ Do not run the check() function in the PKGBUILD or handle the checkdepends\&.
 Do not run the prepare() function in the PKGBUILD\&.
 .RE
 .PP
+\fB\-\-noverify\fR
+.RS 4
+Do not run the verify() function in the PKGBUILD\&.
+.RE
+.PP
 \fB\-\-sign\fR
 .RS 4
 Sign the resulting package with gpg, overriding the setting in
@@ -286,6 +296,11 @@ makepkg is designed to be compatible with Reproducible Builds\&. If the \fBSOURC
 If the \fBSOURCE_DATE_EPOCH\fR environment variable is not set, makepkg will use its own start date for internal use, but will not unify source file timestamps before building\&.
 .SH "ENVIRONMENT VARIABLES"
 .PP
+\fBMAKEPKG_LIBRARY\fR="/path/to/directory"
+.RS 4
+Use an alternative libmakepkg path instead of the /usr/share/makepkg default\&.
+.RE
+.PP
 \fBPACMAN\fR
 .RS 4
 The command that will be used to check for missing dependencies and to install and remove packages\&. Pacman\(cqs
@@ -382,6 +397,11 @@ The version of the
 \fI$BUILDTOOL\fR
 used\&.
 .RE
+.PP
+\fBGITFLAGS\fR
+.RS 4
+The options to pass when checking out git sources, replacing the default "\-\-mirror"\&.
+.RE
 .SH "CONFIGURATION"
 .sp
 See \fBmakepkg.conf\fR(5) for more details on configuring makepkg using the \fImakepkg\&.conf\fR file\&.
@@ -515,17 +535,6 @@ Andrew Gregory <andrew\&.gregory\&.8@gmail\&.com>
 .sp -1
 .IP \(bu 2.3
 .\}
-Eli Schwartz <eschwartz@archlinux\&.org>
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 Morgan Adamiec <morganamilo@archlinux\&.org>
 .RE
 .sp
@@ -608,4 +617,15 @@ Nagy Gabor <ngaba@bibl\&.u\-szeged\&.hu>
 Dave Reisner <dreisner@archlinux\&.org>
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Eli Schwartz <eschwartz@archlinux\&.org>
+.RE
+.sp
 For additional contributors, use git shortlog \-s on the pacman\&.git repository\&.
diff --git a/upstream/fedora-40/man8/mkfs.btrfs.8 b/upstream/fedora-40/man8/mkfs.btrfs.8
index d3a88275..931dbd67 100644
--- a/upstream/fedora-40/man8/mkfs.btrfs.8
+++ b/upstream/fedora-40/man8/mkfs.btrfs.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "MKFS.BTRFS" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "MKFS.BTRFS" "8" "Mar 26, 2024" "6.8" "BTRFS"
 .SH NAME
 mkfs.btrfs \- create a btrfs filesystem
 .SH SYNOPSIS
@@ -1009,6 +1009,6 @@ than can fit into the filesystem.
 \fI\%btrfs(5)\fP,
 \fI\%btrfs(8)\fP,
 \fI\%btrfs\-balance(8)\fP,
-\fBwipefs(8)\fP
+\fI\%wipefs(8)\fP
 .\" Generated by docutils manpage writer.
 .
diff --git a/upstream/fedora-40/man8/pacman-conf.8 b/upstream/fedora-40/man8/pacman-conf.8
index 4b632ea4..dd0ef08d 100644
--- a/upstream/fedora-40/man8/pacman-conf.8
+++ b/upstream/fedora-40/man8/pacman-conf.8
@@ -2,12 +2,12 @@
 .\"     Title: pacman-conf
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-01-25
+.\"      Date: 2024-03-09
 .\"    Manual: Pacman Manual
-.\"    Source: Pacman 6.0.2
+.\"    Source: Pacman 6.1.0
 .\"  Language: English
 .\"
-.TH "PACMAN\-CONF" "8" "2024\-01\-25" "Pacman 6\&.0\&.2" "Pacman Manual"
+.TH "PACMAN\-CONF" "8" "2024\-03\-09" "Pacman 6\&.1\&.0" "Pacman Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -52,7 +52,7 @@ Specify an alternate installation root (default is
 /)\&.
 .RE
 .PP
-\fB\-r, \-\-repo\fR <remote>
+\fB\-r, \-\-repo\fR <repository>
 .RS 4
 Query options for a specific repository\&.
 .RE
@@ -129,17 +129,6 @@ Andrew Gregory <andrew\&.gregory\&.8@gmail\&.com>
 .sp -1
 .IP \(bu 2.3
 .\}
-Eli Schwartz <eschwartz@archlinux\&.org>
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 Morgan Adamiec <morganamilo@archlinux\&.org>
 .RE
 .sp
@@ -222,4 +211,15 @@ Nagy Gabor <ngaba@bibl\&.u\-szeged\&.hu>
 Dave Reisner <dreisner@archlinux\&.org>
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Eli Schwartz <eschwartz@archlinux\&.org>
+.RE
+.sp
 For additional contributors, use git shortlog \-s on the pacman\&.git repository\&.
diff --git a/upstream/fedora-40/man8/pacman-db-upgrade.8 b/upstream/fedora-40/man8/pacman-db-upgrade.8
new file mode 100644
index 00000000..61c18466
--- /dev/null
+++ b/upstream/fedora-40/man8/pacman-db-upgrade.8
@@ -0,0 +1,197 @@
+'\" t
+.\"     Title: pacman-db-upgrade
+.\"    Author: [see the "Authors" section]
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\"      Date: 2024-03-09
+.\"    Manual: Pacman Manual
+.\"    Source: Pacman 6.1.0
+.\"  Language: English
+.\"
+.TH "PACMAN\-DB\-UPGRADE" "8" "2024\-03\-09" "Pacman 6\&.1\&.0" "Pacman Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+pacman-db-upgrade \- upgrade the local pacman database to a newer format
+.SH "SYNOPSIS"
+.sp
+\fIpacman\-db\-upgrade\fR [options]
+.SH "DESCRIPTION"
+.sp
+\fIpacman\-db\-upgrade\fR is a script that upgrades the local database used by \fBpacman\fR(8) to a newer format\&.
+.sp
+Options
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+*\-h, \e\-\-help*::
+Show the built\-in help message and exit\&.
+*\-V, \e\-\-version*::
+Show version information and exit\&.
+*\-d, \e\-\-dbpath* <path>::
+Set an alternate database location\&.
+*\-r, \e\-\-root* <path>::
+Set an alternate installation root\&.
+*\e\-\-config* <path>::
+Set an alternate configuration file\&.
+*\e\-\-nocolor*::
+Remove color from output\&.
+
+See Also
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+\fBpacman\fR(8)
+.sp
+See the pacman website at https://archlinux\&.org/pacman/ for current information on pacman and its related tools\&.
+.SH "BUGS"
+.sp
+Bugs? You must be kidding; there are no bugs in this software\&. But if we happen to be wrong, submit a bug report with as much detail as possible at the Arch Linux Bug Tracker in the Pacman section\&.
+.SH "AUTHORS"
+.sp
+Current maintainers:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Allan McRae <allan@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Andrew Gregory <andrew\&.gregory\&.8@gmail\&.com>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Morgan Adamiec <morganamilo@archlinux\&.org>
+.RE
+.sp
+Past major contributors:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Judd Vinet <jvinet@zeroflux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Aurelien Foret <aurelien@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Aaron Griffin <aaron@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Dan McGee <dan@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Xavier Chantry <shiningxc@gmail\&.com>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Nagy Gabor <ngaba@bibl\&.u\-szeged\&.hu>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Dave Reisner <dreisner@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Eli Schwartz <eschwartz@archlinux\&.org>
+.RE
+.sp
+For additional contributors, use git shortlog \-s on the pacman\&.git repository\&.
diff --git a/upstream/fedora-40/man8/pacman-key.8 b/upstream/fedora-40/man8/pacman-key.8
index a1403f6e..28fed366 100644
--- a/upstream/fedora-40/man8/pacman-key.8
+++ b/upstream/fedora-40/man8/pacman-key.8
@@ -2,12 +2,12 @@
 .\"     Title: pacman-key
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-01-25
+.\"      Date: 2024-03-09
 .\"    Manual: Pacman Manual
-.\"    Source: Pacman 6.0.2
+.\"    Source: Pacman 6.1.0
 .\"  Language: English
 .\"
-.TH "PACMAN\-KEY" "8" "2024\-01\-25" "Pacman 6\&.0\&.2" "Pacman Manual"
+.TH "PACMAN\-KEY" "8" "2024\-03\-09" "Pacman 6\&.1\&.0" "Pacman Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -225,17 +225,6 @@ Andrew Gregory <andrew\&.gregory\&.8@gmail\&.com>
 .sp -1
 .IP \(bu 2.3
 .\}
-Eli Schwartz <eschwartz@archlinux\&.org>
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 Morgan Adamiec <morganamilo@archlinux\&.org>
 .RE
 .sp
@@ -318,4 +307,15 @@ Nagy Gabor <ngaba@bibl\&.u\-szeged\&.hu>
 Dave Reisner <dreisner@archlinux\&.org>
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Eli Schwartz <eschwartz@archlinux\&.org>
+.RE
+.sp
 For additional contributors, use git shortlog \-s on the pacman\&.git repository\&.
diff --git a/upstream/fedora-40/man8/pacman.8 b/upstream/fedora-40/man8/pacman.8
index aed1dc32..2b43793c 100644
--- a/upstream/fedora-40/man8/pacman.8
+++ b/upstream/fedora-40/man8/pacman.8
@@ -2,12 +2,12 @@
 .\"     Title: pacman
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-01-25
+.\"      Date: 2024-03-09
 .\"    Manual: Pacman Manual
-.\"    Source: Pacman 6.0.2
+.\"    Source: Pacman 6.1.0
 .\"  Language: English
 .\"
-.TH "PACMAN" "8" "2024\-01\-25" "Pacman 6\&.0\&.2" "Pacman Manual"
+.TH "PACMAN" "8" "2024\-03\-09" "Pacman 6\&.1\&.0" "Pacman Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -250,7 +250,8 @@ Disable defaults for low speed limit and timeout on downloads\&. Use this if you
 .PP
 \fB\-\-sysroot\fR <dir>
 .RS 4
-Specify an alternative system root\&. Pacman will chroot and chdir into the system root prior to running\&. This allows mounted guest systems to be properly operated on\&. Any other paths given will be interpreted as relative to the system root\&. Requires root privileges\&.
+Specify an alternative system root\&. This path will be prepended to all other configuration directories and any repository servers beginning with
+file://\&. Any paths or URLs passed as targets will not be modified\&. This allows mounted guest systems to be properly operated on\&.
 .RE
 .SH "TRANSACTION OPTIONS (APPLY TO \FI\-S\FR, \FI\-R\FR AND \FI\-U\FR)"
 .PP
@@ -261,7 +262,7 @@ Skips dependency version checks\&. Package names are still checked\&. Normally,
 .PP
 \fB\-\-assume\-installed\fR <package=version>
 .RS 4
-Add a virtual package "package" with version "version" to the transaction to satisfy dependencies\&. This allows to disable specific dependency checks without affecting all dependency checks\&. To disable all dependency checking, see the
+Add a virtual package "package" with version "version" to the transaction to satisfy dependencies\&. This allows disabling the specific dependency checks without affecting all dependency checks\&. To disable all dependency checking, see the
 \fI\-\-nodeps\fR
 option\&.
 .RE
@@ -295,7 +296,7 @@ to specify how targets are displayed\&. The default format string is "%l", which
 .RS 4
 Specify a printf\-like format to control the output of the
 \fI\-\-print\fR
-operation\&. The possible attributes are: "%n" for pkgname, "%v" for pkgver, "%l" for location, "%r" for repository, and "%s" for size\&. Implies
+operation\&. The possible attributes are: "%a" for arch, "%b" for builddate, "%d" for description, "%e" for pkgbase, "%f" for filename, "%g" for base64 encoded PGP signature, "%h" for sha256sum, "%m" for md5sum, "%n" for pkgname, "%p" for packager, "%v" for pkgver, "%l" for location, "%r" for repository, "%s" for size, "%C" for checkdepends, "%D" for depends, "%G" for groups, "%H" for conflicts, "%L" for licenses, "%M" for makedepends, "%O" for optional depends, "%P" for provides and "%R" for replaces\&. Implies
 \fI\-\-print\fR\&.
 .RE
 .SH "UPGRADE OPTIONS (APPLY TO \FI\-S\FR AND \FI\-U\FR)"
@@ -518,7 +519,9 @@ will do a system upgrade and install/upgrade the "foo" package in the same opera
 .PP
 \fB\-y, \-\-refresh\fR
 .RS 4
-Download a fresh copy of the master package database from the server(s) defined in
+Download a fresh copy of the master package databases
+\fI(repo\&.db)\fR
+from the server(s) defined in
 \fBpacman.conf\fR(5)\&. This should typically be used each time you use
 \fI\-\-sysupgrade\fR
 or
@@ -553,7 +556,9 @@ Suppress messages on successful completion of database operations\&.
 .PP
 \fB\-y, \-\-refresh\fR
 .RS 4
-Download fresh package databases from the server\&. Use twice to force a refresh even if databases are up to date\&.
+Download fresh package file databases
+\fI(repo\&.files)\fR
+from the server\&. Use twice to force a refresh even if databases are up to date\&.
 .RE
 .PP
 \fB\-l, \-\-list\fR
@@ -691,17 +696,6 @@ Andrew Gregory <andrew\&.gregory\&.8@gmail\&.com>
 .sp -1
 .IP \(bu 2.3
 .\}
-Eli Schwartz <eschwartz@archlinux\&.org>
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 Morgan Adamiec <morganamilo@archlinux\&.org>
 .RE
 .sp
@@ -784,4 +778,15 @@ Nagy Gabor <ngaba@bibl\&.u\-szeged\&.hu>
 Dave Reisner <dreisner@archlinux\&.org>
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Eli Schwartz <eschwartz@archlinux\&.org>
+.RE
+.sp
 For additional contributors, use git shortlog \-s on the pacman\&.git repository\&.
diff --git a/upstream/fedora-40/man8/repo-add.8 b/upstream/fedora-40/man8/repo-add.8
index dc4ddb43..7e0ef256 100644
--- a/upstream/fedora-40/man8/repo-add.8
+++ b/upstream/fedora-40/man8/repo-add.8
@@ -2,12 +2,12 @@
 .\"     Title: repo-add
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-01-25
+.\"      Date: 2024-03-09
 .\"    Manual: Pacman Manual
-.\"    Source: Pacman 6.0.2
+.\"    Source: Pacman 6.1.0
 .\"  Language: English
 .\"
-.TH "REPO\-ADD" "8" "2024\-01\-25" "Pacman 6\&.0\&.2" "Pacman Manual"
+.TH "REPO\-ADD" "8" "2024\-03\-09" "Pacman 6\&.1\&.0" "Pacman Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -88,6 +88,11 @@ Only add packages that are not already in the database\&. Warnings will be print
 .RS 4
 Remove old package files from the disk when updating their entry in the database\&.
 .RE
+.PP
+\fB\-\-include\-sigs\fR
+.RS 4
+Include package PGP signatures in the repository database (if available)
+.RE
 .SH "EXAMPLE"
 .sp
 \fIrepo\-add\fR foo\&.db\&.tar\&.xz <pkg1> [<pkg2> \&...]
@@ -135,17 +140,6 @@ Andrew Gregory <andrew\&.gregory\&.8@gmail\&.com>
 .sp -1
 .IP \(bu 2.3
 .\}
-Eli Schwartz <eschwartz@archlinux\&.org>
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 Morgan Adamiec <morganamilo@archlinux\&.org>
 .RE
 .sp
@@ -228,4 +222,15 @@ Nagy Gabor <ngaba@bibl\&.u\-szeged\&.hu>
 Dave Reisner <dreisner@archlinux\&.org>
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Eli Schwartz <eschwartz@archlinux\&.org>
+.RE
+.sp
 For additional contributors, use git shortlog \-s on the pacman\&.git repository\&.
diff --git a/upstream/fedora-40/man8/systemd-soft-reboot.service.8 b/upstream/fedora-40/man8/systemd-soft-reboot.service.8
index 33b4ff5f..e7e7c776 100644
--- a/upstream/fedora-40/man8/systemd-soft-reboot.service.8
+++ b/upstream/fedora-40/man8/systemd-soft-reboot.service.8
@@ -263,6 +263,250 @@ File system mounts may remain mounted during the transition, and complex storage
 \fIDefaultDependencies=no\fR, and by avoiding
 \fIConflicts=umount\&.target\fR)
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+If the unit publishes a service over D\-Bus, the connection needs to be re\-established after soft\-reboot as the D\-Bus broker will be stopped and then started again\&. When using the sd\-bus library this can be achieved by adapting the following example\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+/* SPDX\-License\-Identifier: MIT\-0 */
+
+/* Implements a D\-Bus service that automatically reconnects when the system bus is restarted\&.
+ *
+ * Compile with \*(Aqcc sd_bus_service_reconnect\&.c $(pkg\-config \-\-libs \-\-cflags libsystemd)\*(Aq
+ *
+ * To allow the program to take ownership of the name \*(Aqorg\&.freedesktop\&.ReconnectExample\*(Aq,
+ * add the following as /etc/dbus\-1/system\&.d/org\&.freedesktop\&.ReconnectExample\&.conf
+ * and then reload the broker with \*(Aqsystemctl reload dbus\*(Aq:
+
+<?xml version="1\&.0"?> <!\-\-*\-nxml\-*\-\->
+<!DOCTYPE busconfig PUBLIC "\-//freedesktop//DTD D\-BUS Bus Configuration 1\&.0//EN"
+        "http://www\&.freedesktop\&.org/standards/dbus/1\&.0/busconfig\&.dtd">
+<busconfig>
+        <policy user="root">
+                <allow own="org\&.freedesktop\&.ReconnectExample"/>
+                <allow send_destination="org\&.freedesktop\&.ReconnectExample"/>
+                <allow receive_sender="org\&.freedesktop\&.ReconnectExample"/>
+        </policy>
+
+        <policy context="default">
+                <allow send_destination="org\&.freedesktop\&.ReconnectExample"/>
+                <allow receive_sender="org\&.freedesktop\&.ReconnectExample"/>
+        </policy>
+</busconfig>
+
+ *
+ * To get the property via busctl:
+ *
+ * $ busctl \-\-user get\-property org\&.freedesktop\&.ReconnectExample \e
+ *                              /org/freedesktop/ReconnectExample \e
+ *                              org\&.freedesktop\&.ReconnectExample \e
+ *                              Example
+ *   s "example"
+ */
+
+#include <errno\&.h>
+#include <stdio\&.h>
+#include <stdlib\&.h>
+#include <systemd/sd\-bus\&.h>
+
+#define _cleanup_(f) __attribute__((cleanup(f)))
+
+#define check(x) ({                             \e
+  int _r = (x);                                 \e
+  errno = _r < 0 ? \-_r : 0;                     \e
+  printf(#x ": %m\en");                          \e
+  if (_r < 0)                                   \e
+    return EXIT_FAILURE;                        \e
+  })
+
+typedef struct object {
+  const char *example;
+  sd_bus **bus;
+  sd_event **event;
+} object;
+
+static int property_get(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                const char *property,
+                sd_bus_message *reply,
+                void *userdata,
+                sd_bus_error *error) {
+
+  object *o = userdata;
+
+  if (strcmp(property, "Example") == 0)
+    return sd_bus_message_append(reply, "s", o\->example);
+
+  return sd_bus_error_setf(error,
+                           SD_BUS_ERROR_UNKNOWN_PROPERTY,
+                           "Unknown property \*(Aq%s\*(Aq",
+                           property);
+}
+
+/* https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_add_object\&.html */
+static const sd_bus_vtable vtable[] = {
+  SD_BUS_VTABLE_START(0),
+  SD_BUS_PROPERTY(
+    "Example", "s",
+    property_get,
+    0,
+    SD_BUS_VTABLE_PROPERTY_CONST),
+  SD_BUS_VTABLE_END
+};
+
+static int setup(object *o);
+
+static int on_disconnect(sd_bus_message *message, void *userdata, sd_bus_error *ret_error) {
+  check(setup((object *)userdata));
+  return 0;
+}
+
+/* Ensure the event loop exits with a clear error if acquiring the well\-known service name fails */
+static int request_name_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
+  if (!sd_bus_message_is_method_error(m, NULL))
+    return 1;
+
+  const sd_bus_error *error = sd_bus_message_get_error(m);
+
+  if (sd_bus_error_has_names(error, SD_BUS_ERROR_TIMEOUT, SD_BUS_ERROR_NO_REPLY))
+    return 1; /* The bus is not available, try again later */
+
+  printf("Failed to request name: %s\en", error\->message);
+  object *o = userdata;
+  check(sd_event_exit(*o\->event, \-sd_bus_error_get_errno(error)));
+
+  return 1;
+}
+
+static int setup(object *o) {
+  /* If we are reconnecting, then the bus object needs to be closed, detached from
+   * the event loop and recreated\&.
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_detach_event\&.html
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_close_unref\&.html
+   */
+  if (*o\->bus) {
+    check(sd_bus_detach_event(*o\->bus));
+    *o\->bus = sd_bus_close_unref(*o\->bus);
+  }
+
+  /* Set up a new bus object for the system bus, configure it to wait for D\-Bus to be available
+   * instead of failing if it is not, and start it\&. All the following operations are asyncronous
+   * and will not block waiting for D\-Bus to be available\&.
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_new\&.html
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_set_address\&.html
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_set_bus_client\&.html
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_negotiate_creds\&.html
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_set_watch_bind\&.html
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_set_connected_signal\&.html
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_start\&.html
+   */
+  check(sd_bus_new(o\->bus));
+  check(sd_bus_set_address(*o\->bus, "unix:path=/run/dbus/system_bus_socket"));
+  check(sd_bus_set_bus_client(*o\->bus, 1));
+  check(sd_bus_negotiate_creds(*o\->bus, 1, SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS));
+  check(sd_bus_set_watch_bind(*o\->bus, 1));
+  check(sd_bus_start(*o\->bus));
+
+  /* Publish an interface on the bus, specifying our well\-known object access
+   * path and public interface name\&.
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_add_object\&.html
+   * https://dbus\&.freedesktop\&.org/doc/dbus\-tutorial\&.html
+   */
+  check(sd_bus_add_object_vtable(*o\->bus,
+                                 NULL,
+                                 "/org/freedesktop/ReconnectExample",
+                                 "org\&.freedesktop\&.ReconnectExample",
+                                 vtable,
+                                 o));
+  /* By default the service is only assigned an ephemeral name\&. Also add a well\-known
+   * one, so that clients know whom to call\&. This needs to be asynchronous, as
+   * D\-Bus might not be yet available\&. The callback will check whether the error is
+   * expected or not, in case it fails\&.
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_request_name\&.html
+   */
+  check(sd_bus_request_name_async(*o\->bus,
+                                  NULL,
+                                  "org\&.freedesktop\&.ReconnectExample",
+                                  0,
+                                  request_name_callback,
+                                  o));
+  /* When D\-Bus is disconnected this callback will be invoked, which will
+   * set up the connection again\&. This needs to be asynchronous, as D\-Bus might not
+   * yet be available\&.
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_match_signal_async\&.html
+   */
+  check(sd_bus_match_signal_async(*o\->bus,
+                                  NULL,
+                                  "org\&.freedesktop\&.DBus\&.Local",
+                                  NULL,
+                                  "org\&.freedesktop\&.DBus\&.Local",
+                                  "Disconnected",
+                                  on_disconnect,
+                                  NULL,
+                                  o));
+  /* Attach the bus object to the event loop so that calls and signals are processed\&.
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_attach_event\&.html
+   */
+  check(sd_bus_attach_event(*o\->bus, *o\->event, 0));
+
+  return 0;
+}
+
+int main(int argc, char **argv) {
+  /* The bus should be relinquished before the program terminates\&. The cleanup
+   * attribute allows us to do it nicely and cleanly whenever we exit the
+   * block\&.
+   */
+  _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+  _cleanup_(sd_event_unrefp) sd_event *event = NULL;
+  object o = {
+    \&.example = "example",
+    \&.bus = &bus,
+    \&.event = &event,
+  };
+
+  /* Create an event loop data structure, with default parameters\&.
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_event_default\&.html
+   */
+  check(sd_event_default(&event));
+
+  /* By default the event loop will terminate when all sources have disappeared, so
+   * we have to keep it \*(Aqoccupied\*(Aq\&. Register signal handling to do so\&.
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_event_add_signal\&.html
+   */
+  check(sd_event_add_signal(event, NULL, SIGINT|SD_EVENT_SIGNAL_PROCMASK, NULL, NULL));
+  check(sd_event_add_signal(event, NULL, SIGTERM|SD_EVENT_SIGNAL_PROCMASK, NULL, NULL));
+
+  check(setup(&o));
+
+  /* Enter the main loop, it will exit only on sigint/sigterm\&.
+   * https://www\&.freedesktop\&.org/software/systemd/man/sd_event_loop\&.html
+   */
+  check(sd_event_loop(event));
+
+  /* https://www\&.freedesktop\&.org/software/systemd/man/sd_bus_release_name\&.html */
+  check(sd_bus_release_name(bus, "org\&.freedesktop\&.ReconnectExample"));
+
+  return 0;
+}
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.RE
 .PP
 Even though passing resources from one soft reboot cycle to the next is possible this way, we strongly suggest to use this functionality sparingly only, as it creates a more fragile system as resources from different versions of the OS and applications might be mixed with unforeseen consequences\&. In particular it\*(Aqs recommended to
 \fIavoid\fR
diff --git a/upstream/fedora-40/man8/testpkg.8 b/upstream/fedora-40/man8/testpkg.8
new file mode 100644
index 00000000..65f7f4aa
--- /dev/null
+++ b/upstream/fedora-40/man8/testpkg.8
@@ -0,0 +1,173 @@
+'\" t
+.\"     Title: testpkg
+.\"    Author: [see the "Authors" section]
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\"      Date: 2024-03-09
+.\"    Manual: Pacman Manual
+.\"    Source: Pacman 6.1.0
+.\"  Language: English
+.\"
+.TH "TESTPKG" "8" "2024\-03\-09" "Pacman 6\&.1\&.0" "Pacman Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+testpkg \- test a pacman package for validity
+.SH "SYNOPSIS"
+.sp
+\fItestpkg\fR <package file>
+.SH "DESCRIPTION"
+.sp
+\fItestpkg\fR is a script used to make sure that a pacman package is valid\&.
+.SH "SEE ALSO"
+.sp
+\fBpacman\fR(8)
+.sp
+See the pacman website at https://archlinux\&.org/pacman/ for current information on pacman and its related tools\&.
+.SH "BUGS"
+.sp
+Bugs? You must be kidding; there are no bugs in this software\&. But if we happen to be wrong, submit a bug report with as much detail as possible at the Arch Linux Bug Tracker in the Pacman section\&.
+.SH "AUTHORS"
+.sp
+Current maintainers:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Allan McRae <allan@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Andrew Gregory <andrew\&.gregory\&.8@gmail\&.com>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Morgan Adamiec <morganamilo@archlinux\&.org>
+.RE
+.sp
+Past major contributors:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Judd Vinet <jvinet@zeroflux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Aurelien Foret <aurelien@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Aaron Griffin <aaron@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Dan McGee <dan@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Xavier Chantry <shiningxc@gmail\&.com>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Nagy Gabor <ngaba@bibl\&.u\-szeged\&.hu>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Dave Reisner <dreisner@archlinux\&.org>
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Eli Schwartz <eschwartz@archlinux\&.org>
+.RE
+.sp
+For additional contributors, use git shortlog \-s on the pacman\&.git repository\&.
diff --git a/upstream/fedora-40/man8/vercmp.8 b/upstream/fedora-40/man8/vercmp.8
index b429a862..c08bc073 100644
--- a/upstream/fedora-40/man8/vercmp.8
+++ b/upstream/fedora-40/man8/vercmp.8
@@ -2,12 +2,12 @@
 .\"     Title: vercmp
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-01-25
+.\"      Date: 2024-03-09
 .\"    Manual: Pacman Manual
-.\"    Source: Pacman 6.0.2
+.\"    Source: Pacman 6.1.0
 .\"  Language: English
 .\"
-.TH "VERCMP" "8" "2024\-01\-25" "Pacman 6\&.0\&.2" "Pacman Manual"
+.TH "VERCMP" "8" "2024\-03\-09" "Pacman 6\&.1\&.0" "Pacman Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -191,17 +191,6 @@ Andrew Gregory <andrew\&.gregory\&.8@gmail\&.com>
 .sp -1
 .IP \(bu 2.3
 .\}
-Eli Schwartz <eschwartz@archlinux\&.org>
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 Morgan Adamiec <morganamilo@archlinux\&.org>
 .RE
 .sp
@@ -284,4 +273,15 @@ Nagy Gabor <ngaba@bibl\&.u\-szeged\&.hu>
 Dave Reisner <dreisner@archlinux\&.org>
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Eli Schwartz <eschwartz@archlinux\&.org>
+.RE
+.sp
 For additional contributors, use git shortlog \-s on the pacman\&.git repository\&.