From: deraadt <deraadt@openbsd.org>
Date: Thu, 2 Sep 2021 20:33:03 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=efb3fd9189557bb79230d97aa65f09813339a03c;p=openbsd

sync
---

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 5897a9216c6..ca3a9cf5432 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -238,8 +238,8 @@
 ./etc/signify/openbsd-70-pkg.pub
 ./etc/signify/openbsd-70-syspatch.pub
 ./etc/signify/openbsd-71-base.pub
-./etc/signify/openbsd-71-pkg.pub
 ./etc/signify/openbsd-71-fw.pub
+./etc/signify/openbsd-71-pkg.pub
 ./etc/skel
 ./etc/skel/.ssh
 ./etc/ssh
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index b597911b8f4..670d0e04103 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1,3 +1,4 @@
+./usr/bin/timeout
 ./usr/share/doc/mg/tutorial
 ./usr/share/info/amdref.info
 ./usr/share/info/cvs.info
@@ -472,6 +473,7 @@
 ./usr/share/man/man1/tftp.1
 ./usr/share/man/man1/tic.1
 ./usr/share/man/man1/time.1
+./usr/share/man/man1/timeout.1
 ./usr/share/man/man1/tmux.1
 ./usr/share/man/man1/top.1
 ./usr/share/man/man1/touch.1
@@ -1224,6 +1226,7 @@
 ./usr/share/man/man4/andl.4
 ./usr/share/man/man4/aplgpio.4
 ./usr/share/man/man4/aps.4
+./usr/share/man/man4/aq.4
 ./usr/share/man/man4/arc.4
 ./usr/share/man/man4/arcofi.4
 ./usr/share/man/man4/arm64
@@ -1234,6 +1237,7 @@
 ./usr/share/man/man4/arm64/aplintc.4
 ./usr/share/man/man4/arm64/aplns.4
 ./usr/share/man/man4/arm64/aplpcie.4
+./usr/share/man/man4/arm64/aplpinctrl.4
 ./usr/share/man/man4/arm64/aplpmu.4
 ./usr/share/man/man4/arm64/aplspmi.4
 ./usr/share/man/man4/arm64/apm.4