sync

20 files changed, 14 insertions, 20 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index d476fd4715f..ec43f7b721b 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1623,7 +1623,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/alpha-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 556b2a3d578..18c16740c7c 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1655,7 +1655,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/miscfs/fuse/fusefs_node.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/mm_malloc.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/mmintrin.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/amd64-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index a68ad03d404..f48aad97637 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -1638,7 +1638,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fuse/fusefs_node.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/mmintrin.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index d5cb8149aa7..5879e4f1419 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -1636,7 +1636,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fuse/fusefs_node.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/mmintrin.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 178b314cf35..8fbdd30e37f 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1538,7 +1538,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 7b969ef0222..d372bfb5aad 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1625,7 +1625,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/hppa-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 17aba865d4b..4e1961fa450 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1556,7 +1556,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index e96ee701c03..58c68cf6103 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1660,7 +1660,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/fuse/fusefs_node.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/mm_malloc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/mmintrin.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/i386-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 08c112cd34f..e86dfedbf4d 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1582,7 +1582,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/sh-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index f6cf380384d..b0a7149af32 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -1644,7 +1644,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index a41d9b23aeb..d59a27973a5 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1538,7 +1538,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index f047d83d848..42eafe47f8d 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1625,7 +1625,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 0c2c2bd4ad9..e84eb5209c2 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1555,7 +1555,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/mips64-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index ffc46c96ef0..070632ed63a 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1619,7 +1619,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/mips64-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 6c2615c58ef..8b2544b4f76 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -1566,7 +1566,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 22d62071f04..19b4b67a098 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1117,7 +1117,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/sparc-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 159206c4880..2a5f9833d22 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1175,7 +1175,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 41cfc11b6a2..674c09d14ae 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1004,7 +1004,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/fuse
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/fuse/fusefs_node.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/vax-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index bef33451901..ed6bfba2edf 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1592,7 +1592,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fuse/fusefs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/miscfs/fuse/fusefs_node.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/mmintrin.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/msdosfs
 ./usr/libdata/perl5/site_perl/arm-openbsd/msdosfs/bootsect.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/msdosfs/bpb.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 04508fcff1d..0a76de5a1ad 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -950,7 +950,6 @@
 ./usr/include/miscfs/fuse
 ./usr/include/miscfs/fuse/fusefs.h
 ./usr/include/miscfs/fuse/fusefs_node.h
-./usr/include/mpool.h
 ./usr/include/msdosfs
 ./usr/include/msdosfs/bootsect.h
 ./usr/include/msdosfs/bpb.h
@@ -6057,6 +6056,19 @@
 ./usr/share/man/man9/NDINIT.9
 ./usr/share/man/man9/NDINITAT.9
 ./usr/share/man/man9/RWLOCK_INITIALIZER.9
+./usr/share/man/man9/SRPL_EMPTY_LOCKED.9
+./usr/share/man/man9/SRPL_ENTER.9
+./usr/share/man/man9/SRPL_ENTRY_INIT.9
+./usr/share/man/man9/SRPL_FIRST_LOCKED.9
+./usr/share/man/man9/SRPL_FOREACH.9
+./usr/share/man/man9/SRPL_FOREACH_LOCKED.9
+./usr/share/man/man9/SRPL_HEAD_INIT.9
+./usr/share/man/man9/SRPL_INSERT_HEAD_LOCKED.9
+./usr/share/man/man9/SRPL_LEAVE.9
+./usr/share/man/man9/SRPL_NEXT.9
+./usr/share/man/man9/SRPL_NEXT_LOCKED.9
+./usr/share/man/man9/SRPL_RC_INITIALIZER.9
+./usr/share/man/man9/SRPL_REMOVE_LOCKED.9
 ./usr/share/man/man9/SRP_GC_INITIALIZER.9
 ./usr/share/man/man9/SRP_INITIALIZER.9
 ./usr/share/man/man9/SipHash24.9
@@ -6697,6 +6709,7 @@
 ./usr/share/man/man9/srp_leave.9
 ./usr/share/man/man9/srp_update.9
 ./usr/share/man/man9/srp_update_locked.9
+./usr/share/man/man9/srpl_rc_init.9
 ./usr/share/man/man9/startuphook_disestablish.9
 ./usr/share/man/man9/startuphook_establish.9
 ./usr/share/man/man9/stathz.9