Recent changes to this wiki:

Missing #endif
Index: wikisrc/users/mlelstv/disk-driver-template.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/mlelstv/disk-driver-template.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/users/mlelstv/disk-driver-template.mdwn	8 Dec 2016 11:39:34 -0000	1.12
+++ wikisrc/users/mlelstv/disk-driver-template.mdwn	2 May 2021 13:33:00 -0000	1.13
@@ -403,6 +403,7 @@
 			devsw_detach(&xxx_bdevsw, &xxx_cdevsw);
 			break;
 		}
+#endif
 		// some global initialization
 
 #ifdef PSEUDODEVICE

sync
Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wikisrc/global.css	26 Apr 2021 13:39:17 -0000	1.31
+++ wikisrc/global.css	26 Apr 2021 14:30:07 -0000	1.32
@@ -1,4 +1,4 @@
-/* $NetBSD: global.css,v 1.31 2021/04/26 13:39:17 nia Exp $ */
+/* $NetBSD: global.css,v 1.32 2021/04/26 14:30:07 nia Exp $ */
 
 /* Remember to keep htdocs/globals.css and wikisrc/globals.css in sync. */
 /* See https://wiki.NetBSD.org/wiki/cvs/. */
@@ -45,10 +45,26 @@
   text-decoration: underline;
 }
 
-h1 {
+h1, h2, h3, h4, h5 {
   line-height: 1em;
 }
 
+h1 {
+  font-size: 32px;
+}
+
+h2 {
+  font-size: 28px;
+}
+
+h3 {
+  font-size: 24px;
+}
+
+h4 {
+  font-size: 20px;
+}
+
 pre {
   white-space: pre-wrap;
 }
@@ -173,41 +189,6 @@
   margin: 0 auto;
 }
 
-#content h1 {
-  background-color: transparent;
-  line-height: 1.3em;
-  margin: 0;
-  padding: 1ex 0 0 0;
-}
-
-#content h2 {
-  background-color: transparent;
-  line-height: 1.3em;
-  margin: 0;
-  padding: 1ex 0 0 0;
-}
-
-#content h3 {
-  background-color: transparent;
-  line-height: 1.3em;
-  margin: 0;
-  padding: 1ex 0 0 0;
-}
-
-#content h4 {
-  background-color: transparent;
-  line-height: 1.3em;
-  margin: 0;
-  padding: 1ex 0 0 0;
-}
-
-#content h5 {
-  background-color: transparent;
-  line-height: 1.3em;
-  margin: 0;
-  padding: 1ex 0 0 0;
-}
-
 #content p {
   line-height: 1.3em;
   margin: 1em 0 1.5em 0;

sync
Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- wikisrc/global.css	22 Apr 2021 17:40:47 -0000	1.30
+++ wikisrc/global.css	26 Apr 2021 13:39:17 -0000	1.31
@@ -1,4 +1,4 @@
-/* $NetBSD: global.css,v 1.30 2021/04/22 17:40:47 nia Exp $ */
+/* $NetBSD: global.css,v 1.31 2021/04/26 13:39:17 nia Exp $ */
 
 /* Remember to keep htdocs/globals.css and wikisrc/globals.css in sync. */
 /* See https://wiki.NetBSD.org/wiki/cvs/. */
@@ -49,14 +49,6 @@
   line-height: 1em;
 }
 
-h3 {
-  color: #777777;
-}
-
-h4 {
-  color: #777777;
-}
-
 pre {
   white-space: pre-wrap;
 }

No schedule yet, but make clear that 8.3 will happen
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- wikisrc/releng.mdwn	25 Apr 2021 10:25:14 -0000	1.45
+++ wikisrc/releng.mdwn	25 Apr 2021 10:28:24 -0000	1.46
@@ -20,7 +20,7 @@
 
 ### NetBSD 8.x
 
-* Next minor release: NetBSD 8.3 (no schedule)
+* Next minor release: NetBSD 8.3 (no schedule, will happen before the 10.0 release)
   + CVS branch tag: <code>netbsd-8</code>
 * [Current pull-up queue for the netbsd-8 branch](http://releng.netbsd.org/cgi-bin/req-8.cgi)
 

Add a provisional date for 9.2
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wikisrc/releng.mdwn	20 Oct 2020 13:42:03 -0000	1.44
+++ wikisrc/releng.mdwn	25 Apr 2021 10:25:14 -0000	1.45
@@ -14,7 +14,7 @@
 
 ### NetBSD 9.x
 
-* Next minor release: NetBSD 9.2 (no schedule)
+* Next minor release: NetBSD 9.2 (provisional scheduled for may 12)
   + CVS branch tag: <code>netbsd-9</code>
 * [Current pull-up queue for the netbsd-9 branch](http://releng.netbsd.org/cgi-bin/req-9.cgi)
 

sync
Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wikisrc/global.css	22 Apr 2021 12:15:51 -0000	1.29
+++ wikisrc/global.css	22 Apr 2021 17:40:47 -0000	1.30
@@ -1,4 +1,4 @@
-/* $NetBSD: global.css,v 1.29 2021/04/22 12:15:51 nia Exp $ */
+/* $NetBSD: global.css,v 1.30 2021/04/22 17:40:47 nia Exp $ */
 
 /* Remember to keep htdocs/globals.css and wikisrc/globals.css in sync. */
 /* See https://wiki.NetBSD.org/wiki/cvs/. */
@@ -130,7 +130,6 @@
 
 #navBar a {
   font-weight: 600;
-  opacity: 0.8;
   display: block;
   color: #34495e;
   padding: 0.3em;

sync
Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wikisrc/global.css	17 Apr 2021 17:15:05 -0000	1.28
+++ wikisrc/global.css	22 Apr 2021 12:15:51 -0000	1.29
@@ -1,4 +1,4 @@
-/* $NetBSD: global.css,v 1.28 2021/04/17 17:15:05 nia Exp $ */
+/* $NetBSD: global.css,v 1.29 2021/04/22 12:15:51 nia Exp $ */
 
 /* Remember to keep htdocs/globals.css and wikisrc/globals.css in sync. */
 /* See https://wiki.NetBSD.org/wiki/cvs/. */
@@ -126,7 +126,6 @@
   top: 0;
   bottom: 0;
   left: 0;
-  opacity: 1;
 }
 
 #navBar a {
@@ -184,7 +183,6 @@
 }
 
 #content h1 {
-  color: #777777;
   background-color: transparent;
   line-height: 1.3em;
   margin: 0;
@@ -192,7 +190,6 @@
 }
 
 #content h2 {
-  color: #777777;
   background-color: transparent;
   line-height: 1.3em;
   margin: 0;
@@ -200,7 +197,6 @@
 }
 
 #content h3 {
-  color: #777777;
   background-color: transparent;
   line-height: 1.3em;
   margin: 0;
@@ -208,7 +204,6 @@
 }
 
 #content h4 {
-  color: #777777;
   background-color: transparent;
   line-height: 1.3em;
   margin: 0;
@@ -216,7 +211,6 @@
 }
 
 #content h5 {
-  color: #777777;
   background-color: transparent;
   line-height: 1.3em;
   margin: 0;
@@ -517,27 +511,27 @@
 }
 
 .head {
-  Font-family: Arial, Verdana, Helvetica, sans-serif;
+  Font-family: sans-serif;
   Font-size: 120%;
   Font-weight: bold;
   Color: #777777;
 }
 
 .subhead {
-  Font-family: Arial, Verdana, Helvetica, sans-serif;
+  Font-family: sans-serif;
   Font-size: 90%;
   Font-weight: bold;
   Color: #777777;
 }
 
 .newsindex {
-  Font-family: Geneva, "Lucida Grande", Arial, Verdana, sans-serif;
+  Font-family: sans-serif;
   Font-size: 80%;
   Font-weight: normal;
 }
 
 .webtoc {
-  Font-Family: "Lucida Grande", Geneva, Arial, Verdana, sans-serif;
+  Font-Family: sans-serif;
 }
 
 .foothome {
@@ -558,7 +552,7 @@
 }
 
 .pkgname {
-  Font-Family: "Arial", "Helvetica", "Courier New", "Courier", "fixed", monospace;
+  Font-Family: sans-serif;
   Font-Style: Italic;
   Text-Decoration: none;
   Line-Height: 1.3em;

GNOME: update reference to meta-pkgs/gnome. Fix typos
Index: wikisrc/GNOME.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/GNOME.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/GNOME.mdwn	13 Apr 2021 12:08:30 -0000	1.2
+++ wikisrc/GNOME.mdwn	19 Apr 2021 11:13:28 -0000	1.3
@@ -4,7 +4,7 @@
 
 [GNOME](https://gnome.org/) is an X11 desktop environment designed to simple and easy to use. It is 
 developed by [The GNOME Project](https://en.wikipedia.org/wiki/The_GNOME_Project). Components of GNOME3 
-and later versions have been ported to NetBSD and are available through [[pkgsrc]]([meta-pkgs/gnome3](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome3/index.html))
+and later versions have been ported to NetBSD and are available through [[pkgsrc]]([meta-pkgs/gnome](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome/index.html))
 and [pkgsrc-wip](https://pkgsrc.org/wip/)
 
 GNOME packages are under active development. Only Xorg session are currently supported. Input gestures 
@@ -12,8 +12,8 @@
 
 ## Installation
 A minimal GNOME session would require [gnome-session](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/x11/gnome-session/), 
-[mutter](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/wm/mutter/), and [gnome-shell](h(http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome3/index.html).
-[meta-pkgs/gnome3](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome3/index.html) offers an easy way to install the components and applications
+[mutter](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/wm/mutter/), and [gnome-shell](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/x11/gnome-shell/).
+[meta-pkgs/gnome](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome/index.html) offers an easy way to install the components and applications
 needed for running GNOME.
 
 ## Running

sync
Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wikisrc/global.css	30 Nov 2020 08:03:37 -0000	1.27
+++ wikisrc/global.css	17 Apr 2021 17:15:05 -0000	1.28
@@ -1,4 +1,4 @@
-/* $NetBSD: global.css,v 1.27 2020/11/30 08:03:37 maya Exp $ */
+/* $NetBSD: global.css,v 1.28 2021/04/17 17:15:05 nia Exp $ */
 
 /* Remember to keep htdocs/globals.css and wikisrc/globals.css in sync. */
 /* See https://wiki.NetBSD.org/wiki/cvs/. */
@@ -10,6 +10,9 @@
   font-size: 16px;
   letter-spacing: 0;
   color: #34495e;
+  max-width: 1200px;
+  margin-left: auto;
+  margin-right: auto;
 }
 
 ::selection {

Remove a 'k' that snuck in in last couple of commits
Index: wikisrc/ports/hppa.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hppa.mdwn,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wikisrc/ports/hppa.mdwn	15 Apr 2021 17:55:27 -0000	1.17
+++ wikisrc/ports/hppa.mdwn	15 Apr 2021 19:52:36 -0000	1.18
@@ -143,7 +143,7 @@
 #### Other sources of information ([top](#general))
 
 -   [[hppa FAQ|hppafaq]]
--   [OpenBSD/hppa](http://www.openbsd.org/hppa.html)k
+-   [OpenBSD/hppa](http://www.openbsd.org/hppa.html)
 -   [PA-RISC Linux Development
     Project](http://parisc-linux.org/index.html)
 -   [The Cypher HP PA-RISC Project page](http://www.openpa.net/) (good

Fix typo in filename, hopefully will be generated now.
--- wikisrc/ports/hppa/qemu_hppa.mdwm	2021-04-15 18:01:31.822991064 +0000
+++ /dev/null	2021-04-15 18:01:05.986782497 +0000
@@ -1,37 +0,0 @@
-[[!meta title="NetBSD/hppa under QEMU"]]
-
-This page attempts to document running NetBSD/hppa under the
-[QEMU](http://www.qemu.org/) open source processor emulator.
-This can be extremely useful for development and testing.
-
-# Requirements
-* mainstream qemu 5.2.0 or higher
-* pkgsrc qemu 4.0.0nb2 or higher
-* ISO image
-  * [NetBSD 9.x hppa](https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/images/NetBSD-9.1_STABLE-hppa.iso)
-
-# Installing QEMU on NetBSD
-You can install latest qemu with the following commands.
-It is assumed that your pkgsrc tree is in /usr/pkgsrc directory.
-
-    # cd /usr/pkgsrc/emulators/qemu
-    # make install
-
-# Creating a disk image
-
-    qemu-img create -f qcow2 hdd.img 2G			# change size
-
-# Booting the system from ISO image for install
-
-    $ qemu-system-hppa \
-       -drive file=hdd.img \
-       -drive file=NetBSD-9.1_STABLE-hppa.iso,media=cdrom \
-       -boot order=d \
-       -nographic
-
-# Booting the system post install
-
-    $ qemu-system-hppa \
-       -drive file=hdd.img \
-       -drive file=NetBSD-9.1_STABLE-hppa.iso,media=cdrom \
-       -nographic
--- /dev/null	2021-04-15 18:01:05.986782497 +0000
+++ wikisrc/ports/hppa/qemu_hppa.mdwn	2021-04-15 18:01:31.867552313 +0000
@@ -0,0 +1,37 @@
+[[!meta title="NetBSD/hppa under QEMU"]]
+
+This page attempts to document running NetBSD/hppa under the
+[QEMU](http://www.qemu.org/) open source processor emulator.
+This can be extremely useful for development and testing.
+
+# Requirements
+* mainstream qemu 5.2.0 or higher
+* pkgsrc qemu 4.0.0nb2 or higher
+* ISO image
+  * [NetBSD 9.x hppa](https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/images/NetBSD-9.1_STABLE-hppa.iso)
+
+# Installing QEMU on NetBSD
+You can install latest qemu with the following commands.
+It is assumed that your pkgsrc tree is in /usr/pkgsrc directory.
+
+    # cd /usr/pkgsrc/emulators/qemu
+    # make install
+
+# Creating a disk image
+
+    qemu-img create -f qcow2 hdd.img 2G			# change size
+
+# Booting the system from ISO image for install
+
+    $ qemu-system-hppa \
+       -drive file=hdd.img \
+       -drive file=NetBSD-9.1_STABLE-hppa.iso,media=cdrom \
+       -boot order=d \
+       -nographic
+
+# Booting the system post install
+
+    $ qemu-system-hppa \
+       -drive file=hdd.img \
+       -drive file=NetBSD-9.1_STABLE-hppa.iso,media=cdrom \
+       -nographic

Move qemu into supported hardware section
Index: wikisrc/ports/hppa.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hppa.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/ports/hppa.mdwn	15 Apr 2021 17:52:56 -0000	1.16
+++ wikisrc/ports/hppa.mdwn	15 Apr 2021 17:55:27 -0000	1.17
@@ -6,7 +6,6 @@
 changes_future="10.0"
 thumbnail="//www.netbsd.org/images/ports/hp700/715.gif"
 about="""
-
 NetBSD/hppa is the port of NetBSD to the Hewlett-Packard 9000 Series
 700 workstations, which are based on HP's Precision Architecture RISC
 (PA-RISC) CPUs. These machines superseded the HP 9000 Series 300 and 400
@@ -135,9 +134,8 @@
 -   HIL keyboard (*hilkbd*)
 -   HIL mouse (*hilms*)
 
-"""
-additional="""
-### QEMU
+QEMU
+----
 
 See the [[NetBSD/hppa under QEMU|qemu_hppa]] page for instructions on how to get started with QEMU.
 """

whitespace commit, hoping to regenerate this page
Index: wikisrc/ports/hppa.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hppa.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/ports/hppa.mdwn	15 Apr 2021 10:36:25 -0000	1.15
+++ wikisrc/ports/hppa.mdwn	15 Apr 2021 17:52:56 -0000	1.16
@@ -6,6 +6,7 @@
 changes_future="10.0"
 thumbnail="//www.netbsd.org/images/ports/hp700/715.gif"
 about="""
+
 NetBSD/hppa is the port of NetBSD to the Hewlett-Packard 9000 Series
 700 workstations, which are based on HP's Precision Architecture RISC
 (PA-RISC) CPUs. These machines superseded the HP 9000 Series 300 and 400
@@ -144,7 +145,7 @@
 #### Other sources of information ([top](#general))
 
 -   [[hppa FAQ|hppafaq]]
--   [OpenBSD/hppa](http://www.openbsd.org/hppa.html)
+-   [OpenBSD/hppa](http://www.openbsd.org/hppa.html)k
 -   [PA-RISC Linux Development
     Project](http://parisc-linux.org/index.html)
 -   [The Cypher HP PA-RISC Project page](http://www.openpa.net/) (good

xen howto: retract hopeful statement about EFI
on rereading the thread, it isn't supported
Members: 
	ports/xen/howto.mdwn:1.206->1.207 

Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- wikisrc/ports/xen/howto.mdwn	15 Apr 2021 15:21:25 -0000	1.206
+++ wikisrc/ports/xen/howto.mdwn	15 Apr 2021 15:23:22 -0000	1.207
@@ -153,8 +153,7 @@
 changing the kernel and boot configuration.
 
 NB: As of 2021-04, you must arrange to have the system use BIOS boot,
-not EFI boot.  (Perhaps, with recent current and using multiboot
-instead of NetBSD boot, this might not be true.)
+not EFI boot.
 
 In 2018-05, trouble booting a dom0 was reported with 256M of RAM: with
 512M it worked reliably.  This does not make sense, but if you see

xen howto: BIOS/EFI and ugprade improvements
Note that one needs to use BIOS boot, not EFI, for a dom0, for now.
Thanks to Greg Woods for details about updating Xen in a dom0; this
text is summarized from on and off list comments.
Thanks to Greg Woods for details about updating Xen in a dom0; this
text is summarized from on and off list comments.

Members: 
	ports/xen/howto.mdwn:1.205->1.206 

Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- wikisrc/ports/xen/howto.mdwn	15 Mar 2021 23:01:56 -0000	1.205
+++ wikisrc/ports/xen/howto.mdwn	15 Apr 2021 15:21:25 -0000	1.206
@@ -152,6 +152,10 @@
 NetBSD system, and then pivot the install to a dom0 install by
 changing the kernel and boot configuration.
 
+NB: As of 2021-04, you must arrange to have the system use BIOS boot,
+not EFI boot.  (Perhaps, with recent current and using multiboot
+instead of NetBSD boot, this might not be true.)
+
 In 2018-05, trouble booting a dom0 was reported with 256M of RAM: with
 512M it worked reliably.  This does not make sense, but if you see
 "not ELF" after Xen boots, try increasing dom0 RAM.
@@ -354,10 +358,30 @@
 
 ## Updating Xen in a dom0
 
-Basically, update the xenkernel and xentools packages and copy the new
-Xen kernel into place, and reboot.  This procedure should be usable to
-update to a new Xen release, but the reader is reminded that having a
-non-Xen boot methods was recommended earlier.
+Note the previous advice to maintain a working and tested boot config
+into GENERIC without Xen.
+
+Updating Xen in a dom0 consists of updating the xnekernel and xentools
+packages, along with copying the xen.gz into place, and of course
+rebooting.
+
+If updating along a Xen minor version, e.g. from 4.13.1 to 4.13.2, or
+from 4.13.2nb1 to 4.13.2nb3, it is very likely that this can be done
+on a running system.  The point is that the xentools programs will be
+replaced, and you will be using "xl" from the new installation to talk
+to the older programs which are still running.  Problems from this
+update path should be reported.
+
+For added safety, shutdown all domUs before updating, to remove the
+need for new xl to talk to old xenstored.  Note that Xen does not
+guarantee stability of internal ABIs.
+
+If updating across Xen minor versions, e.g. from 4.11 to 4.13, the
+likelihood of trouble is increased.  Therefore, 'make replace' of
+xentools on a dom0 with running domUs is not recommended.  A shutdown
+on all domUs before replacing xentools is likely sufficient.  A safer
+appraoch is to boot into GENERIC to replace the packages, as then no
+Xen code will be running.  Single user is another option.
 
 ## Updating NetBSD in a dom0
 

NetBSD/hppa under qemu
Index: wikisrc/ports/hppa.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hppa.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/ports/hppa.mdwn	20 Oct 2020 13:42:03 -0000	1.14
+++ wikisrc/ports/hppa.mdwn	15 Apr 2021 10:36:25 -0000	1.15
@@ -136,6 +136,11 @@
 
 """
 additional="""
+### QEMU
+
+See the [[NetBSD/hppa under QEMU|qemu_hppa]] page for instructions on how to get started with QEMU.
+"""
+additional="""
 #### Other sources of information ([top](#general))
 
 -   [[hppa FAQ|hppafaq]]
--- /dev/null	2021-04-15 10:37:05.977407276 +0000
+++ wikisrc/ports/hppa/qemu_hppa.mdwm	2021-04-15 10:37:14.120291528 +0000
@@ -0,0 +1,37 @@
+[[!meta title="NetBSD/hppa under QEMU"]]
+
+This page attempts to document running NetBSD/hppa under the
+[QEMU](http://www.qemu.org/) open source processor emulator.
+This can be extremely useful for development and testing.
+
+# Requirements
+* mainstream qemu 5.2.0 or higher
+* pkgsrc qemu 4.0.0nb2 or higher
+* ISO image
+  * [NetBSD 9.x hppa](https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/images/NetBSD-9.1_STABLE-hppa.iso)
+
+# Installing QEMU on NetBSD
+You can install latest qemu with the following commands.
+It is assumed that your pkgsrc tree is in /usr/pkgsrc directory.
+
+    # cd /usr/pkgsrc/emulators/qemu
+    # make install
+
+# Creating a disk image
+
+    qemu-img create -f qcow2 hdd.img 2G			# change size
+
+# Booting the system from ISO image for install
+
+    $ qemu-system-hppa \
+       -drive file=hdd.img \
+       -drive file=NetBSD-9.1_STABLE-hppa.iso,media=cdrom \
+       -boot order=d \
+       -nographic
+
+# Booting the system post install
+
+    $ qemu-system-hppa \
+       -drive file=hdd.img \
+       -drive file=NetBSD-9.1_STABLE-hppa.iso,media=cdrom \
+       -nographic

Fix markdown newlines
Index: wikisrc/GNOME.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/GNOME.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/GNOME.mdwn	13 Apr 2021 12:04:37 -0000	1.1
+++ wikisrc/GNOME.mdwn	13 Apr 2021 12:08:30 -0000	1.2
@@ -13,7 +13,6 @@
 ## Installation
 A minimal GNOME session would require [gnome-session](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/x11/gnome-session/), 
 [mutter](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/wm/mutter/), and [gnome-shell](h(http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome3/index.html).
-
 [meta-pkgs/gnome3](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome3/index.html) offers an easy way to install the components and applications
 needed for running GNOME.
 
@@ -21,7 +20,8 @@
 The [D-Bus daemon](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/sysutils/dbus/) [must be started](https://www.netbsd.org/docs/guide/en/chap-rc.html) before attempting to run a GNOME session.
 
 ### Manually
-Add the following to the `~/.xinitrc` file and run `startx`:
+Add the following to the `~/.xinitrc` file and run `startx`:  
+
 	# uncomment the following line, and replace ${PREFIX} in case mutter crashes due to XCURSOR_PATH
 	# export XCURSOR_PATH=${PREFIX}/share/icons
 	exec gnome-session
\ No newline at end of file

Add GNOME wiki page with installation instructions
--- /dev/null	2021-04-13 12:05:04.784914158 +0000
+++ wikisrc/GNOME.mdwn	2021-04-13 12:05:16.929860126 +0000
@@ -0,0 +1,27 @@
+[[!meta title="GNOME"]]
+
+# GNOME
+
+[GNOME](https://gnome.org/) is an X11 desktop environment designed to simple and easy to use. It is 
+developed by [The GNOME Project](https://en.wikipedia.org/wiki/The_GNOME_Project). Components of GNOME3 
+and later versions have been ported to NetBSD and are available through [[pkgsrc]]([meta-pkgs/gnome3](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome3/index.html))
+and [pkgsrc-wip](https://pkgsrc.org/wip/)
+
+GNOME packages are under active development. Only Xorg session are currently supported. Input gestures 
+are not available and haven't been tested.
+
+## Installation
+A minimal GNOME session would require [gnome-session](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/x11/gnome-session/), 
+[mutter](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/wm/mutter/), and [gnome-shell](h(http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome3/index.html).
+
+[meta-pkgs/gnome3](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome3/index.html) offers an easy way to install the components and applications
+needed for running GNOME.
+
+## Running
+The [D-Bus daemon](http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/sysutils/dbus/) [must be started](https://www.netbsd.org/docs/guide/en/chap-rc.html) before attempting to run a GNOME session.
+
+### Manually
+Add the following to the `~/.xinitrc` file and run `startx`:
+	# uncomment the following line, and replace ${PREFIX} in case mutter crashes due to XCURSOR_PATH
+	# export XCURSOR_PATH=${PREFIX}/share/icons
+	exec gnome-session

Add wiki page for myself
--- /dev/null	2021-04-13 10:23:06.610867566 +0000
+++ wikisrc/users/cirnatdan.mdwn	2021-04-13 10:23:47.528423892 +0000
@@ -0,0 +1 @@
+Hello

link to pkgsrc.org now it doesn't suck
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- wikisrc/templates/page.tmpl	7 Apr 2021 07:35:42 -0000	1.70
+++ wikisrc/templates/page.tmpl	12 Apr 2021 14:03:52 -0000	1.71
@@ -82,7 +82,7 @@
 		    Gallery</a></li>
 	<li><a href="//wiki.NetBSD.org/ports/">
 		    Ports</a></li>
-	<li><a href="//cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/">
+	<li><a href="//www.pkgsrc.org/">
 		    Packages</a></li>
 	</ul>
 	</li>

Remove page
Except for `The NetBSD Guide' it always pointed out to non-existing pages and
a subset of `NetBSD Documentation' on htdocs (mostly of the `Guides' section).
Members: 
	guide.mdwn:1.2->1.3(DEAD) 

--- wikisrc/guide.mdwn	2021-04-12 13:23:23.271367919 +0000
+++ /dev/null	2021-04-12 13:23:05.524376348 +0000
@@ -1,25 +0,0 @@
-# The NetBSD Guide
-## Wiki version of the NetBSD guide
-
-## NetBSD
-
-### For users
-
-For people who want to install and administer computers running the NetBSD operating system:  
-[[NetBSD users guide|guide/index]]
-
-### For developers
-For people who want to develop system software on NetBSD or interested in it's internals.
-
-[[NetBSD developers guide|guide/netbsd/developers]]
-
-## pkgsrc
-### For users
-For people who want to bootstrap and use pkgsrc for package management.
-
-[[pkgsrc users guide|guide/pkgsrc/users]]
-
-### For developers
-For people who want to develop packages for the pkgsrc package management framework or interested in it's internals.
-
-[[pkgsrc developers guide|guide/pkgsrc/developers]]

Deduplicate and redirect contents to the maintained The NetBSD Guide on htdocs
This replace all existent contents with a Markdown redirect so possible
indexed pages/bookmarks can be gracefully converted to the version on
www.NetBSD.org.
The wikisrc version was originally converted from htdocs in 2014 but
not really kept maintained. Discussed on netbsd-docs@ on August 2019
and recently pointed out by <nia> always on netbsd-docs@ (and several
times during the last years via IRC/MLs).
The wikisrc version was originally converted from htdocs in 2014 but
not really kept maintained.  Discussed on netbsd-docs@ on August 2019
and recently pointed out by <nia> always on netbsd-docs@ (and several
times during the last years via IRC/MLs).

Members: 
	guide/audio.mdwn:1.4->1.5 
	guide/bluetooth.mdwn:1.3->1.4 
	guide/boot.mdwn:1.12->1.13 
	guide/build.mdwn:1.4->1.5 
	guide/carp.mdwn:1.4->1.5 
	guide/ccd.mdwn:1.5->1.6 
	guide/cgd.mdwn:1.7->1.8 
	guide/cons.mdwn:1.5->1.6 
	guide/dns.mdwn:1.5->1.6 
	guide/edit.mdwn:1.3->1.4 
	guide/exinst.mdwn:1.7->1.8 
	guide/fetch.mdwn:1.5->1.6 
	guide/inetd.mdwn:1.5->1.6 
	guide/inst-media.mdwn:1.3->1.4 
	guide/inst.mdwn:1.6->1.7 
	guide/intro.mdwn:1.6->1.7 
	guide/kernel.mdwn:1.5->1.6 
	guide/linux.mdwn:1.4->1.5 
	guide/lvm.mdwn:1.4->1.5 
	guide/mail.mdwn:1.6->1.7 
	guide/misc.mdwn:1.4->1.5 
	guide/net-intro.mdwn:1.6->1.7 
	guide/net-practice.mdwn:1.7->1.8 
	guide/net-services.mdwn:1.5->1.6 
	guide/pam.mdwn:1.5->1.6 
	guide/print.mdwn:1.4->1.5 
	guide/raidframe.mdwn:1.13->1.14 
	guide/rc.mdwn:1.6->1.7 
	guide/rmmedia.mdwn:1.6->1.7 
	guide/tuning.mdwn:1.3->1.4 
	guide/updating.mdwn:1.6->1.7 
	guide/upgrading.mdwn:1.4->1.5 
	guide/veriexec.mdwn:1.6->1.7 
	guide/x.mdwn:1.3->1.4 

Index: wikisrc/guide/audio.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/audio.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/guide/audio.mdwn	19 Jun 2015 19:18:27 -0000	1.4
+++ wikisrc/guide/audio.mdwn	12 Apr 2021 13:15:02 -0000	1.5
@@ -1,135 +1,2 @@
-**Contents**
-
-[[!toc levels=3]]
-
-# Audio
-
-This chapter is a short introduction to the usage of audio devices on NetBSD (who wants a dumb computer, anyway?).
-
-## Basic hardware elements
-
-In order to make audio work on your system you must know what audio card is installed. Sadly it is often not enough to know the brand and model of the card, because many cards use chipsets manufactured from third parties. Therefore knowing the chipset installed on the audio card can sometimes be useful. The NetBSD kernel can recognize many chipsets and a quick look at `dmesg` is enough most of the time.
-
-Therefore, type the following command:
-
-    # dmesg | less
-
-and look for the audio card and chipset. If you're lucky you won't need to do anything because NetBSD automatically detects and configures many audio cards.
-If you want to explicitly look for detected audio devices, you should watch out for strings like `audio` or `sound`. This might give you a clue about audio devices you don't know the name of.
-
-    # dmesg | grep audio
-    # dmesg | grep sound
-
-Sometimes audio doesn't work because the card is not supported or because you need to do some work in order for the card to be detected by NetBSD. Many audio cards are nowadays very cheap, and it is worth considering buying a different card, but before doing this you can try some simple steps to make the card work with NetBSD.
-
-## Supported audio cards
-
-The number of supported sound cards is ever increasing. The main source for supported audio devices are the manpages. You should have a look at the drivers listed in the *SEE ALSO* section of [[!template id=man name="audio" section="4"]].
-
-## BIOS settings
-
-This section is useful only to the owners of i386 PCs; on other architectures (e.g. Amiga) there are no such features. The most important thing to determine in order to use the audio card with NetBSD is the type of bus supported by the card.
-
-The most common interfaces are PCI, PCI Express and USB.
-
-### Note
-
-On many systems everything works fine even if this option is enabled. This is highly system dependent.
-
-## Configuring the audio device
-
-During the installation of NetBSD the devices are created in the `/dev` directory. We are primarily interested in:
-
- * `/dev/audio`  
- * `/dev/sound`  
- * `/dev/mixer`
-
-If they are not present they can be created like this:
-
-    # cd /dev
-    # ./MAKEDEV all
-
-This command creates all devices, including the audio devices.
-
-The audio card is now probably ready to be used without further work.
-
-You can make a quick test whether output works by sending data to the device (`/dev/sound` or `/dev/audio`). You can send anything to it (e.g., take `/dev/urandom`), maybe a file, maybe even something useful (which might be indicated by the `.au` extension). Be sure to turn your speakers quiet, as it will result in noise!
-
-    # cat /dev/urandom > /dev/audio
-
-or
-
-    # cat /dev/urandom > /dev/sound
-
-If you hear something it means that the card is supported by NetBSD and was recognized and configured by the kernel at boot; otherwise you must configure the kernel settings for the audio device installed on the system (assuming the card/chipset is supported.)
-
-## Multiple audio devices
-
-Audio devices are enumerated, starting at 0. If you have multiple audio cards, you will want to switch between the audio devices. By default, `/dev/sound` and `/dev/audio` are symlinks pointing to `/dev/sound0` and `/dev/audio0` resp.
-Many applications provide an option to choose the audio device. But if you want to switch the default audio device, you have to change these symlinks. Assuming you want to use the second audio device (determining the numbers as described [[earlier|guide/audio#basic-hardware-elements]]), delete these two symlinks and replace them by the appropriate ones:
-
-    # rm /dev/sound
-    # rm /dev/audio
-    # ln -s /dev/sound /dev/sound0
-    # ln -s /dev/audio /dev/audio0
-
-## Configuring the kernel audio devices
-
-NetBSD supports a wide range of audio cards and the GENERIC kernel already enables and configures most of them. For older systems, it might be necessary to manually set up the IRC and DMA for non-PnP ISA cards.
-
-### Note
-
-When you create a custom kernel it is better to work on a copy of the GENERIC file, as described in [[Compiling the kernel|guide/kernel]].
-
-If you still have problems you can try enabling all the devices, because some audio cards can be made to work only by emulating another card.
-
-Many chipset make use of the SoundBlaster and OPL compatibility, but a great number of them work with the WSS emulation.
-
-OPL is a MIDI synthesizer produced by Yamaha; there are many OPL variants (e.g. OPL2, OPL3SA, OPL3SA2, etc.). Many audio cards rely on this component or on a compatible one. For example, the chips produced by Crystal (and amongst them the very common CS423x) all have this chipset, and that's why they work with NetBSD.
-
-WSS is not a microchip; it is the acronym of Windows Sound System. WSS is the name of the NetBSD kernel driver which supports the audio system of Microsoft Windows. Many audio cards work with Windows because they adhere to this standard (WSS) and the same holds for NetBSD.
-
-Of the many audio cards that I tested with NetBSD, a good number work only if `opl*` and `wss*` are enabled in the kernel.
-
-When everything works you can disable in the kernel configuration file the devices that you don't need.
-
-## Advanced commands
-
-NetBSD comes with a number of commands that deal with audio devices. They are:
-
- * [[!template id=man name="audioctl" section="1"]] -- is used for setting options of the audio system driver.
- * [[!template id=man name="mixerctl" section="1"]] -- is used for controlling mixing variables, e.g., volume, balance and mute.
- * [[!template id=man name="audioplay" section="1"]] -- is used for playing audio files.
- * [[!template id=man name="audiorecord" section="1"]] -- is used for recording audio files.
-
-
-### [[!template id=man name="audioctl" section="1"]]
-
-[[!template id=man name="audioctl" section="1"]] made its appearance in NetBSD 1.3 and is used to manually set some variables regarding audio I/O, like the frequencies for playing and recording. The available parameters can be displayed with the following command:
-
-    # audioctl -a | less
-
-For example, to listen to CD quality music you can use the following command.
-
-    # audioctl -w play=44100,2,16,slinear_le
-
-This command sets the frequency to 44100Hz, 2 audio channels, 16 bit, slinear\_le encoding.
-
-You can see the supported encodings with:
-
-    # audioctl encodings
-
-This command displays the list of all the encodings supported by the audio card on your system.
-
-### [[!template id=man name="mixerctl" section="1"]]
-
-This command is used to configure the audio mixing and has an interface similar to that of [[!template id=man name="audioctl" section="1"]].
-
-### [[!template id=man name="audioplay" section="1"]]
-
-With this command you can play audio files in simple formats like ULAW and WAV. For more sophisticated needs you might want to install one of the many programs available in the package system which let you play audio files in different formats (e.g. MP3, etc.)
-
-### [[!template id=man name="audiorecord" section="1"]]
-
-Not unsurprisingly this command is used to record audio files.
-
+This page was moved to:
+[The NetBSD Guide - Audio chapter](//www.NetBSD.org/docs/guide/en/chap-audio.html)
Index: wikisrc/guide/bluetooth.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/bluetooth.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/guide/bluetooth.mdwn	19 Jun 2015 19:18:30 -0000	1.3
+++ wikisrc/guide/bluetooth.mdwn	12 Apr 2021 13:15:02 -0000	1.4
@@ -1,706 +1,2 @@
-**Contents**
-
-[[!toc levels=3]]
-

(Diff truncated)
htmlscrubber is probably enabled, just use Markdown anchors
Index: wikisrc/guide/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/index.mdwn,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wikisrc/guide/index.mdwn	12 Apr 2021 12:39:48 -0000	1.38
+++ wikisrc/guide/index.mdwn	12 Apr 2021 12:49:35 -0000	1.39
@@ -1 +1,2 @@
-[[!meta redir="https://www.NetBSD.org/docs/guide/en/"]]
+This page was moved to:
+[The NetBSD Guide](//www.NetBSD.org/docs/guide/en/)

Retrying to redir by forcing https:// schema
Index: wikisrc/guide/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/index.mdwn,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wikisrc/guide/index.mdwn	12 Apr 2021 12:35:55 -0000	1.37
+++ wikisrc/guide/index.mdwn	12 Apr 2021 12:39:48 -0000	1.38
@@ -1 +1 @@
-[[!meta redir="//www.NetBSD.org/docs/guide/en/"]]
+[[!meta redir="https://www.NetBSD.org/docs/guide/en/"]]

Try to redirect to the (maintained) htdocs guide.
This is intended to gradually redirect to the guide currently
maintained in htdocs to avoid possibly breaking indexed pages for
several months/a year or so.
Members: 
	guide/index.mdwn:1.36->1.37 

Index: wikisrc/guide/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/index.mdwn,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wikisrc/guide/index.mdwn	4 May 2019 15:06:20 -0000	1.36
+++ wikisrc/guide/index.mdwn	12 Apr 2021 12:35:55 -0000	1.37
@@ -1,428 +1 @@
-
-# The NetBSD Guide
-
-## Purpose of this guide
-
-This guide describes the installation and the configuration of the NetBSD
-operating system as well as the setup and administration of some of its
-subsystems. It primarily addresses people coming from other Unix-like operating
-systems, and aims to be a useful guide in the face of the many small problems
-one encounters when using a new tool.
-
-This guide is not a Unix tutorial: basic knowledge of some concepts and tools
-is assumed. You should know, for example, what a file and a directory are, and
-how to use an editor. There are plenty of books explaining basic Unix and
-operating system concepts, and you should consult one if you need more
-background information. It is better to choose a general book and avoid titles
-like "Learning Unix-XYZ, version 1.2.3.4 in 10 days", but this is a matter of
-personal taste.
-
-Originally, the guide has been a book, which was subsequently moved to the wiki
-to make it easier to contribute.
-
-If you have additions or comments to the guide, but don't want to create an
-account, feel free to post your submissions to the
-[www team](mailto:www@netbsd.org) or the
-[docs mailing list](http://www.netbsd.org/mailinglists/#netbsd-docs). The text is maintained in
-Markdown, and you can use the button in the top right corner to show the source
-of an article.
-
-## Table of Contents
-
-***I. About NetBSD***
-
- * [[1. What is NetBSD?|guide/intro]]
-   * [[1.1. The story of NetBSD|guide/intro#index1h2]]
-   * [[1.2. NetBSD features|guide/intro#index2h2]]
-   * [[1.3. Supported platforms|guide/intro#index3h2]]
-   * [[1.4. NetBSD's target users|guide/intro#index4h2]]
-   * [[1.5. Applications for NetBSD|guide/intro#index5h2]]
-   * [[1.6. How to get NetBSD|guide/intro#index6h2]]
-
-***II. System installation and related issues***
-
- * [[2. Installing NetBSD: Preliminary considerations and preparations|guide/inst]]
-   * [[2.1. Preliminary considerations|guide/inst#index1h2]]
-   * [[2.2. Install preparations|guide/inst#index2h2]]
-   * [[2.3. Checklist|guide/inst#index3h2]]
- * [[3. Example installation|guide/exinst]]
-   * [[3.1. Introduction|guide/exinst#index1h2]]
-   * [[3.2. The installation process|guide/exinst#index2h2]]
-   * [[3.3. Keyboard layout|guide/exinst#index3h2]]
-   * [[3.4. Starting the installation|guide/exinst#index4h2]]
-   * [[3.5. MBR partitions|guide/exinst#index5h2]]
-   * [[3.6. Disklabel partitions|guide/exinst#index6h2]]
-   * [[3.7. Setting the disk name|guide/exinst#index7h2]]
-   * [[3.8. Last chance!|guide/exinst#index8h2]]
-   * [[3.9. The disk preparation process|guide/exinst#index9h2]]
-   * [[3.10. Choosing the installation media|guide/exinst#index10h2]]
-   * [[3.11. Extracting sets|guide/exinst#index11h2]]
-   * [[3.12. System configuration|guide/exinst#index12h2]]
-   * [[3.13. Finishing the installation|guide/exinst#index13h2]]
- * [[4. Upgrading NetBSD|guide/upgrading]]
-   * [[4.1. Using sysinst|guide/upgrading#index1h2]]
-   * [[4.2. Using sysupgrade|guide/upgrading#index2h2]]
-
-***III. System configuration, administration and tuning***
-
- * [[5. The first steps on NetBSD|guide/boot]]
-   * [[5.1. Troubleshooting|guide/boot#index1h2]]
-   * [[5.2. The man command|guide/boot#index2h2]]
-   * [[5.3. Editing configuration files|guide/boot#index3h2]]
-   * [[5.4. Login|guide/boot#index4h2]]
-   * [[5.5. Changing the root password|guide/boot#index5h2]]
-   * [[5.6. Adding users|guide/boot#index6h2]]
-   * [[5.7. Shadow passwords|guide/boot#index7h2]]
-   * [[5.8. Changing the keyboard layout|guide/boot#index8h2]]
-   * [[5.9. System time|guide/boot#index9h2]]
-   * [[5.10. Secure Shell ssh(1)|guide/boot#index10h2]]
-   * [[5.11. Basic configuration in /etc/rc.conf|guide/boot#index11h2]]
-   * [[5.12. Basic network settings|guide/boot#index12h2]]
-   * [[5.13. Mounting a CD-ROM|guide/boot#index13h2]]
-   * [[5.14. Mounting a floppy|guide/boot#index14h2]]
-   * [[5.15. Installing additional software|guide/boot#index15h2]]
-   * [[5.16. Security alerts|guide/boot#index16h2]]
-   * [[5.17. Stopping and rebooting the system|guide/boot#index17h2]]
- * [[6. Editing|guide/edit]]
-   * [[6.1. Introducing vi|guide/edit#index1h2]]
-   * [[6.2. Configuring vi|guide/edit#index2h2]]
-   * [[6.3. Using tags with vi|guide/edit#index3h2]]
- * [[7. The rc.d System|guide/rc]]
-   * [[7.1. Basics|guide/rc#index1h2]]
-   * [[7.2. The rc.d scripts|guide/rc#index2h2]]
-   * [[7.3. Order/dependencies of start determined by rcorder|guide/rc#index3h2]]
-   * [[7.4. rc.d scripts of additional services|guide/rc#index4h2]]
-   * [[7.5. Additional Reading|guide/rc#index5h2]]
- * [[8. Console drivers|guide/cons]]
-   * [[8.1. wscons|guide/cons#index1h2]]
- * [[9. X|guide/x]]
-   * [[9.1. What is X?|guide/x#index1h2]]
-   * [[9.2. Configuration|guide/x#index2h2]]
-   * [[9.3. The mouse|guide/x#index3h2]]
-   * [[9.4. The keyboard|guide/x#index4h2]]
-   * [[9.5. The monitor|guide/x#index5h2]]
-   * [[9.6. The video card|guide/x#index6h2]]
-   * [[9.7. Starting X|guide/x#index7h2]]
-   * [[9.8. Customizing X|guide/x#index8h2]]
-   * [[9.9. Other window managers or desktop environments|guide/x#index9h2]]
-   * [[9.10. Graphical login with xdm|guide/x#index10h2]]
- * [[10. Linux emulation|guide/linux]]
-   * [[10.1. Emulation setup|guide/linux#index1h2]]
-   * [[10.2. Directory structure|guide/linux#index2h2]]
-   * [[10.3. Emulating /proc|guide/linux#index3h2]]
-   * [[10.4. Using Linux browser plugins|guide/linux#index4h2]]
-   * [[10.5. Further reading|guide/linux#index5h2]]
- * [[11. Audio|guide/audio]]
-   * [[11.1. Basic hardware elements|guide/audio#index1h2]]
-   * [[11.2. Supported audio cards|guide/audio#index2h2]]
-   * [[11.3. BIOS settings|guide/audio#index3h2]]
-   * [[11.4. Configuring the audio device|guide/audio#index4h2]]
-   * [[11.5. Multiple audio devices|guide/audio#index5h2]]
-   * [[11.6. Configuring the kernel audio devices|guide/audio#index6h2]]
-   * [[11.7. Advanced commands|guide/audio#index7h2]]
- * [[12. Printing|guide/print]]
-   * [[12.1. Enabling the printer daemon|guide/print#index1h2]]
-   * [[12.2. Configuring `/etc/printcap`|guide/print#index2h2]]
-   * [[12.3. Configuring Ghostscript|guide/print#index3h2]]
-   * [[12.4. Printer management commands|guide/print#index4h2]]
-   * [[12.5. Remote printing|guide/print#index5h2]]
- * [[13. Using removable media|guide/rmmedia]]
-   * [[13.1. Reading data CDs with NetBSD|guide/rmmedia#index1h2]]
-   * [[13.2. Reading multi-session CDs with NetBSD|guide/rmmedia#index2h2]]
-   * [[13.3. Allowing normal users to access CDs|guide/rmmedia#index3h2]]
-   * [[13.4. Mounting an ISO image|guide/rmmedia#index4h2]]
-   * [[13.5. Using video CDs with NetBSD|guide/rmmedia#index5h2]]
-   * [[13.6. Using audio CDs with NetBSD|guide/rmmedia#index6h2]]
-   * [[13.7. Creating an MP3 (MPEG layer 3) file from an audio CD|guide/rmmedia#index7h2]]
-   * [[13.8. Using a CD-R writer with data CDs|guide/rmmedia#index8h2]]
-   * [[13.9. Using a CD-R writer to create audio CDs|guide/rmmedia#index9h2]]
-   * [[13.10. Creating an audio CD from MP3s|guide/rmmedia#index10h2]]
-   * [[13.11. Copying an audio CD|guide/rmmedia#index11h2]]
-   * [[13.12. Copying a data CD with two drives|guide/rmmedia#index12h2]]
-   * [[13.13. Using CD-RW rewritables|guide/rmmedia#index13h2]]
-   * [[13.14. DVD support|guide/rmmedia#index14h2]]
-   * [[13.15. Creating ISO images from a CD|guide/rmmedia#index15h2]]
-   * [[13.16. Getting volume information from CDs and ISO images|guide/rmmedia#index16h2]]
-   * [[13.17. Initializing and using floppy disks|guide/rmmedia#index17h2]]
- * [[14. The cryptographic device driver (CGD)|guide/cgd]]
-   * [[14.1. Overview|guide/cgd#index1h2]]
-   * [[14.2. Components of the Crypto-Graphic Disk system|guide/cgd#index2h2]]
-   * [[14.3. Example: encrypting your disk|guide/cgd#index3h2]]
-   * [[14.4. Example: encrypted CDs/DVDs|guide/cgd#index4h2]]
-   * [[14.5. Suggestions and Warnings|guide/cgd#index5h2]]
-   * [[14.6. Further Reading|guide/cgd#index6h2]]
- * [[15. Concatenated Disk Device (CCD) configuration|guide/ccd]]
-   * [[15.1. Install physical media|guide/ccd#index1h2]]
-   * [[15.2. Configure Kernel Support|guide/ccd#index2h2]]
-   * [[15.3. Disklabel each volume member of the CCD|guide/ccd#index3h2]]
-   * [[15.4. Configure the CCD|guide/ccd#index4h2]]
-   * [[15.5. Initialize the CCD device|guide/ccd#index5h2]]
-   * [[15.6. Create a 4.2BSD/UFS filesystem on the new CCD device|guide/ccd#index6h2]]
-   * [[15.7. Mount the filesystem|guide/ccd#index7h2]]
- * [[16. NetBSD RAIDframe|guide/raidframe]]
-   * [[16.1. RAIDframe Introduction|guide/raidframe#index1h2]]
-   * [[16.2. Setup RAIDframe Support|guide/raidframe#index2h2]]
-   * [[16.3. Example: RAID-1 Root Disk|guide/raidframe#index3h2]]
- * [[17. NetBSD Logical Volume Manager (LVM) configuration|guide/lvm]]
-   * [[17.1. Anatomy of NetBSD Logical Volume Manager|guide/lvm#index1h2]]
-   * [[17.2. Install physical media|guide/lvm#index2h2]]
-   * [[17.3. Configure Kernel Support|guide/lvm#index3h2]]
-   * [[17.4. Configure LVM on a NetBSD system|guide/lvm#index4h2]]
-   * [[17.5. Disklabel each physical volume member of the LVM|guide/lvm#index5h2]]
-   * [[17.6. Create Physical Volumes|guide/lvm#index6h2]]
-   * [[17.7. Create Volume Group|guide/lvm#index7h2]]
-   * [[17.8. Create Logical Volume|guide/lvm#index8h2]]
-   * [[17.9. Example: LVM with Volume groups located on raid1|guide/lvm#index9h2]]
- * [[18. Pluggable Authentication Modules (PAM)|guide/pam]]
-   * [[18.1. About|guide/pam#index1h2]]
-   * [[18.2. Introduction|guide/pam#index2h2]]
-   * [[18.3. Terms and conventions|guide/pam#index3h2]]
-   * [[18.4. PAM Essentials|guide/pam#index4h2]]
-   * [[18.5. PAM Configuration|guide/pam#index5h2]]
-   * [[18.6. PAM modules|guide/pam#index6h2]]
-   * [[18.7. PAM Application Programming|guide/pam#index7h2]]
-   * [[18.8. PAM Module Programming|guide/pam#index8h2]]
-   * [[18.9. Sample PAM Application|guide/pam#index9h2]]
-   * [[18.10. Sample PAM Module|guide/pam#index10h2]]
-   * [[18.11. Sample PAM Conversation Function|guide/pam#index11h2]]
-   * [[18.12. Further Reading|guide/pam#index12h2]]

(Diff truncated)
Remove reference to compat_solaris
Index: wikisrc/ports/sparc64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc64.mdwn,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wikisrc/ports/sparc64.mdwn	7 Apr 2021 07:35:42 -0000	1.31
+++ wikisrc/ports/sparc64.mdwn	7 Apr 2021 07:58:00 -0000	1.32
@@ -15,10 +15,7 @@
 NetBSD/sparc64 supports both 32-bit and 64-bit kernels. A 32-bit kernel runs
 all NetBSD/sparc binaries. A 64-bit kernel runs 64-bit binaries, and has
 support for running most 32-bit binaries as well, with the exception of some
-low level kernel groveling tools. Additionally, NetBSD/sparc64 is able to run
-Solaris 64 and 32 bit binaries with emulation. See
-[[!template id=man name="compat_netbsd32" section="8" collection="NetBSD-5.1"]],
-[[!template id=man name="compat_solaris" section="8" collection="NetBSD-5.1"]] and the pkgsrc package [`emulators/netbsd32_compat16`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/emulators/netbsd32_compat16/).
+low level kernel groveling tools.
 
 Martin Husemann is the maintainer for NetBSD/sparc64.
 """

Update for README.html transition
Index: wikisrc/puffs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/puffs.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/puffs.mdwn	9 Sep 2020 19:54:25 -0000	1.4
+++ wikisrc/puffs.mdwn	7 Apr 2021 07:35:41 -0000	1.5
@@ -116,23 +116,23 @@
 infrastructure work a number of FUSE packages were added to pkgsrc in the new
 *filesystem* category. Example packages that are currently available include:
 
- * [fuse](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/filesystems/fuse/README.html)
+ * [fuse](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/filesystems/fuse/)
    -- filesystem in userspace (compat headers, pkg-config files, etc.), needed for
    pkgsrc on Linux
 
- * [fuse-archivemount](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/filesystems/fuse-archivemount/README.html)
+ * [fuse-archivemount](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/filesystems/fuse-archivemount/)
    -- FUSE gateway to libarchive
 
- * [fuse-cddfs](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/filesystems/fuse-cddfs/README.html)
+ * [fuse-cddfs](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/filesystems/fuse-cddfs/)
    -- FUSE filesystem that uses libparanoia for audio CDs
 
- * [fuse-ntfs-3g](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/filesystems/fuse-ntfs-3g/README.html)
+ * [fuse-ntfs-3g](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/filesystems/fuse-ntfs-3g/)
    -- a NTFS driver with read and write support
 
  * ...
 
 More packages are currently being worked on, please see
-[pkgsrc/filesystems](ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/filesystems/README.html)
+[pkgsrc/filesystems](ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/filesystems/)
 for a full list.
 
 Here is an example of installing and using the FUSE-enabled NTFS-3g
Index: wikisrc/guide/cgd.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/cgd.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/guide/cgd.mdwn	12 Aug 2020 16:00:48 -0000	1.6
+++ wikisrc/guide/cgd.mdwn	7 Apr 2021 07:35:41 -0000	1.7
@@ -317,7 +317,7 @@
 newfs on it. Neither can you just put a CDR into the drive, configure cgd and
 assume it to write encrypted data when syncing. Standard CDs contain at least an
 ISO-9660 filesystem created with mkisofs(8) from the
-[`sysutils/cdrtools`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/sysutils/cdrtools/README.html)
+[`sysutils/cdrtools`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/sysutils/cdrtools/)
 package. ISO images must *not* contain disklabels or cgd partitions.
 
 But of course CD reader/writer hardware doesn't care about filesystems at all.
@@ -423,7 +423,7 @@
 The following commands are examples to burn the images on CD or DVD. Please
 adjust the `dev=` for cdrecord or the `/dev/rcd0d` for growisofs. Note the
 `r` on the `rcd0d` *is* necessary with NetBSD. Growisofs is available in the
-[`sysutils/dvd+rw-tools`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/sysutils/dvd+rw-tools/README.html)
+[`sysutils/dvd+rw-tools`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/sysutils/dvd+rw-tools/)
 package. Again, use `c` instead of `d` if this is the raw partition on your
 platform.
 
Index: wikisrc/guide/cons.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/cons.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/guide/cons.mdwn	3 Oct 2020 09:03:40 -0000	1.4
+++ wikisrc/guide/cons.mdwn	7 Apr 2021 07:35:41 -0000	1.5
@@ -314,7 +314,7 @@
 
 If you want to edit a font, you can use the old pcvt utils that are available in
 the
-[`sysutils/pcvt-utils`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/sysutils/pcvt-utils/README.html)
+[`sysutils/pcvt-utils`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/sysutils/pcvt-utils/)
 package.
 
 ### wskbd
Index: wikisrc/guide/print.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/print.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/guide/print.mdwn	19 Jun 2015 19:18:31 -0000	1.3
+++ wikisrc/guide/print.mdwn	7 Apr 2021 07:35:41 -0000	1.4
@@ -9,13 +9,13 @@
 that comes with NetBSD. First, the system will be configured to print text
 documents, and next the configuration will be extended to print PostScript
 documents using the Ghostscript program
-([`print/ghostscript`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/print/ghostscript/README.html)).
+([`print/ghostscript`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/print/ghostscript/)).
 Please note that there are other, alternative printing systems available from
 the [packages collection](http://www.NetBSD.org/docs/software/packages.html),
 like LPRng
-([`print/LPRng`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/print/LPRng/README.html))
+([`print/LPRng`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/print/LPRng/))
 and the Common Unix Printing System (CUPS)
-([`print/cups`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/print/cups/README.html))
+([`print/cups`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/print/cups/))
 which are not covered here.
 
 ## Enabling the printer daemon
Index: wikisrc/guide/rmmedia.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/rmmedia.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/guide/rmmedia.mdwn	19 Jun 2015 19:18:31 -0000	1.5
+++ wikisrc/guide/rmmedia.mdwn	7 Apr 2021 07:35:41 -0000	1.6
@@ -200,10 +200,10 @@
 To play MPEG Video streams as many DVD players can play them under NetBSD, mount
 the CD as you would do with any normal (data) CD (see [[Reading data CDs with
 NetBSD|guide/rmmedia#cdrom]]), then use the
-[`multimedia/xine-ui`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/xine-ui/README.html),
-[`multimedia/mplayer`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/mplayer/README.html)
+[`multimedia/xine-ui`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/xine-ui/),
+[`multimedia/mplayer`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/mplayer/)
 or
-[`multimedia/gmplayer`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/gmplayer/README.html)
+[`multimedia/gmplayer`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/gmplayer/)
 package to play the mpeg files stored on the CD.
 
 ## Using audio CDs with NetBSD
@@ -213,17 +213,17 @@
  1. Tell the CD drive to play to the headphone or to a soundcard, to which
 	CDROMs are usually connected internally. Use programs like
 	[[!template id=man name="cdplay" section="1"]],
-	[`audio/xmcd`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/xmcd/README.html),
+	[`audio/xmcd`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/xmcd/),
 	"kscd" from the
-	[`multimedia/kdemultimedia3`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/kdemultimedia3/README.html)
+	[`multimedia/kdemultimedia3`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/kdemultimedia3/)
 	package, mixer programs like
 	[[!template id=man name="mixerctl" section="1"]],
-	[`audio/xmix`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/xmix/README.html),
-	[`audio/xmmix`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/xmmix/README.html),
+	[`audio/xmix`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/xmix/),
+	[`audio/xmmix`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/xmmix/),
 	the Curses based
-	[`audio/cam`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/cam/README.html),
+	[`audio/cam`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/cam/),
 	or kmix, which is part of
-	[`multimedia/kdemultimedia3`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/kdemultimedia3/README.html).
+	[`multimedia/kdemultimedia3`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/multimedia/kdemultimedia3/).
 
 	This usually works well on both SCSI and IDE (ATAPI) CDROMs, CDRW and DVD
 	drives.
@@ -233,7 +233,7 @@
 	to do this:
 
 	 * For most ATAPI, SCSI and several proprietary CDROM drives, the
-	   [`audio/cdparanoia`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/cdparanoia/README.html)
+	   [`audio/cdparanoia`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/cdparanoia/)
 	   package can be used. With cdparanoia the data can be saved to a file or
 	   directed to standard output in WAV, AIFF, AIFF-C or raw format. Currently
 	   the -g option is required by the NetBSD version of cdparanoia. A
@@ -246,7 +246,7 @@
            $ cdparanoia -g /dev/rcd0d -B
 
 	 * For ATAPI or SCSI CD-ROMs the
-	   [`audio/cdd`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/cdd/README.html)
+	   [`audio/cdd`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/cdd/)
 	   package can be used. To extract track 2 with cdd, type:
 
            # cdd -t 2 `pwd`
@@ -254,7 +254,7 @@
        This will put a file called `track-02.cda` in the current directory.
 
 	 * For SCSI CD-ROMS the
-	   [`audio/tosha`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/tosha/README.html)
+	   [`audio/tosha`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/tosha/)
 	   package can be used. To extract track 2 with tosha, you should be able to
 	   type:
 
@@ -278,7 +278,7 @@
 	this job if your ripping program (e.g. tosha, cdd) didn't already do the job
 	for you!
 
-     * Using the [`audio/sox`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/sox/README.html) package, type:
+     * Using the [`audio/sox`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/sox/) package, type:
 
            $ sox -s -w -c 2 -r 44100 -t cdr track-02.cda track-02.wav
 
@@ -288,7 +288,7 @@
 
  3. Encode the WAV file into MP3 format.
 
-     * Using the [`audio/bladeenc`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/bladeenc/README.html) package, type:
+     * Using the [`audio/bladeenc`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/audio/bladeenc/) package, type:
 
            $ bladeenc -128 -QUIT track-02.wav
 
@@ -297,7 +297,7 @@
 	   bit-rates in more detail.
 
 	 * Using the

(Diff truncated)
clean up some TODOs
Index: wikisrc/pkgsrc/hardening.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/hardening.mdwn,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- wikisrc/pkgsrc/hardening.mdwn	6 Jan 2019 18:09:25 -0000	1.46
+++ wikisrc/pkgsrc/hardening.mdwn	6 Apr 2021 10:36:45 -0000	1.47
@@ -29,10 +29,12 @@
 library functions that do not have built-in bounds checking - but
 could in some cases.
 
-**TODO**: Explain FORTIFY_SOURCE 1 vs 2, and which is used. Give a link
-to a good explanation of the technique. Explain if this is gcc specific.
+Two mitigation levels are available:
 
-It has been enabled by default since pkgsrc-2017Q3.
+- "weak" only enables checks at compile-time.
+- "strong" enables checks at compile-time and runtime.
+
+`strong` has been enabled by default since pkgsrc-2017Q3.
 
 ### PKGSRC_USE_SSP
 
@@ -211,14 +213,8 @@
 ### Packages failing to build
 
 The stack-smashing protection provided by this option does not work for some
-programs. The two most common situations in which this happens are:
-
-* the program makes use of the `alloca(3)` library call (memory allocator on the
-  stack) (**TODO**: at least regarding build failure, this was a problem only
-  with older gcc version and probably do not apply in most common pkgsrc setup
-  (i.e. no PR/mails about that seen in the last years about that.))
-* the program allocates variables on the stack, with the size determined at
-  run-time.
+programs. The most common situation in which this happens is when the program
+allocates variables on the stack, with the size determined at run-time.
 
 Both cases will require a modification to the program, or disabling this feature
 by adding in the package `Makefile`:

Add tpm(4) resume bounty.
--- /dev/null	2021-03-31 21:27:05.944569764 +0000
+++ wikisrc/projects/project/tpm_resume.mdwn	2021-03-31 21:28:01.114181990 +0000
@@ -0,0 +1,24 @@
+[[!template id=project
+
+title="Fix PR 56086: Resume hangs when tpm(4) is enabled"
+
+contact="""
+[tech-kern](mailto:tech-kern@NetBSD.org)
+"""
+
+category="kernel"
+difficulty="medium"
+funded="coypu@sdf.org ($500 expires 1/January/2023)"
+description="""
+
+
+From [the bug](http://gnats.netbsd.org/56086):
+"I was wondering why my machine could no longer resume. Turns out it's because I enabled tpm(4) in the BIOS.
+
+With a disabled tpm...  The machine can reliably resume."
+
+Related: the OpenBSD tpm(4) driver might not share this failure.
+
+"""
+
+]]

Add additional bounties.
Index: wikisrc/projects/project/xhci_resume.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/xhci_resume.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/xhci_resume.mdwn	25 Mar 2021 20:02:16 -0000	1.2
+++ wikisrc/projects/project/xhci_resume.mdwn	31 Mar 2021 21:23:36 -0000	1.3
@@ -8,7 +8,7 @@
 
 category="kernel"
 difficulty="medium"
-funded="coypu@sdf.org ($200 expires 1/July/2021)"
+funded="coypu@sdf.org ($200 expires 1/July/2021), nia ($100), abs ($200, if it fixes Thinkpad T480 too)"
 description="""
 
 Currently, devices connected via xhci do not work after resume.  

include autogenerated index
Index: wikisrc/tutorials/x11.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/x11.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/tutorials/x11.mdwn	31 Mar 2021 06:20:45 -0000	1.2
+++ wikisrc/tutorials/x11.mdwn	31 Mar 2021 07:19:30 -0000	1.3
@@ -1,2 +1,4 @@
 * [[DRI, AIGLX, Composite and Compiz|compiz]]
 * [[wsfb UEFI/BIOS framebuffer display driver|how_to_use_wsfb_uefi_bios_framebuffer]]
+
+[[!map pages="x11/*" ]]

add deets for gtk3
Index: wikisrc/tutorials/x11/how_to_use_gtk_applications_with_lightweight_window_managers___42__box__44___e17__44___etc..mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/x11/how_to_use_gtk_applications_with_lightweight_window_managers___42__box__44___e17__44___etc..mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/tutorials/x11/how_to_use_gtk_applications_with_lightweight_window_managers___42__box__44___e17__44___etc..mdwn	31 Mar 2021 07:03:51 -0000	1.1
+++ wikisrc/tutorials/x11/how_to_use_gtk_applications_with_lightweight_window_managers___42__box__44___e17__44___etc..mdwn	31 Mar 2021 07:17:06 -0000	1.2
@@ -16,9 +16,19 @@
 
 #  choosing your gtk theme
 
-To solve the second problem, you need to create a .gtkrc-2.0 file in your home directory with the following lines : 
+For `gtk2+` applications, you need to create a .gtkrc-2.0 file in your home directory with the following lines : 
     
     gtk-theme-name = "Clearlooks"
     gtk-icon-theme-name = "gnome"
+    gtk-font-name = "Sans 12"
     
 
+For `gtk3+`, the file is `~/.config/gtk-3.0/settings.ini`:
+
+    [Settings]
+    gtk-theme-name = Material-compact
+    gtk-icon-theme-name = adwaita
+    gtk-font-name = Sans 12
+    gtk-enable-animations = false
+    gtk-application-prefer-dark-theme = false
+    gtk-menu-popup-delay = 0

move fluxbox
--- wikisrc/tutorials/fluxbox.mdwn	2021-03-31 07:12:36.532754567 +0000
+++ /dev/null	2021-03-31 07:12:06.185968067 +0000
@@ -1,262 +0,0 @@
-Fluxbox is yet another windowmanager for X. 
-
-It is based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and handles styles, colors, window placement, and similar things exactly like blackbox (100% theme/style compatibility). 
-
-#  Install Fluxbox 
-
-To install fluxbox use its package provided in pkgsrc [wm/fluxbox](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/wm/fluxbox/README.html): 
-    
-
-    # cd /usr/pkgsrc/wm/fluxbox
-    # make install
-    
-
-When installation is finished, define fluxbox by creating _.xinit_ file in user home directory: 
-    
-    # cd /root
-    # vi .xinitrc
-    
-
-The typical contents of this file is: 
-    
-    exec fluxbox
-    
-
-To make further tunes per your needs, you can create fluxbox directory and place into it your configuration files. 
-    
-    # mkdir /home/myuser/.fluxbox
-    
-    
-
-Tipical configuration is _/root/.fluxbox/menu_ file, with following contents: 
-    
-    # Generated by fluxbox-generate_menu
-    #
-    # If you read this it means you want to edit this file manually, so here
-    # are some useful tips:
-    #
-    # - You can add your own menu-entries to ~/.fluxbox/usermenu
-    #
-    # - If you miss apps please let me know and I will add them for the next
-    #   release.
-    #
-    # - The -r option prevents removing of empty menu entries and lines which
-    #   makes things much more readable.
-    #
-    # - To prevent any other app from overwriting your menu
-    #   you can change the menu name in .fluxbox/init to:
-    #     session.menuFile: /home/you/.fluxbox/my-menu
-    [begin] (TMT Fluxbox-0.9.10)
-         [exec] (konqueror) {konqueror}
-         [exec] (mozilla) {mozilla}
-         [exec] (Open Office) {soffice}
-         [exec] (Kword) {kword}
-         [exec] (Kspread) {kspread}
-         [exec] (kwrite) {kwrite}
-         [exec] (Calculator) {kcalc}
-         [exec] (vmware) {vmware}
-         [exec] (mc) {xterm -e mc}
-         [exec] (notes) {knotes}
-         [exec] (Work time) {karm}
-         [exec] (Organizer) {korganizer}
-         [separator]
-    [submenu] (CD, Floppy)
-         [exec] (My-Files) {konqueror /mnt}
-         [separator]
-         [exec] (Mount-CD) {mount_cd9660 /dev/cd0a /mnt/cdrom}
-         [exec] (UNmount-CD) {cd ~ && umount -f /dev/cd0a}
-         [exec] (xcdroast) {xcdroast}
-         [separator]
-         [exec] (Mount-Floppy) {mount_msdos /dev/fd0a /mnt/floppy}
-         [exec] (UNmount-Floppy) {cd ~ && umount -f /dev/fd0a}
-         [exec] (format floppy) {kfloppy}
-    [end]
-    [submenu] (Internet)
-         [exec] (netscape) {netscape}
-         [exec] (HTML editor) {quanta}
-         [exec] (Dictionary) {kdict}
-         [exec] (Kmail) {kmail}
-         [exec] (Kmail-korn) {korn}
-         [exec] (Instant-messanger) {kopete}
-         [exec] (KPPP) {kppp}
-         [exec] (KPPP logview) {kppplogview}
-    [end]
-    [submenu] (Education)
-         [exec] (Type tutor) {ktouch}
-         [exec] (Mendileev) {kalzium}
-         [exec] (Planetarium) {kstars}
-    [end]
-    [submenu] (Graphics)
-         [exec] (Quikshow) {kuickshow}
-         [exec] (Kview) {kview}
-         [exec] (PDF) {kpdf}
-         [exec] (GhostView-pdf) {kghostview}
-         [exec] (FAX) {kdeprintfax}
-         [exec] (Faxview) {kfax}
-         [exec] (Scaner) {kooka}
-         [exec] (Snap shot) {ksnapshot}
-         [exec] (Icon editor) {kiconedit}
-         [exec] (gimp) {gimp}
-         [exec] (Paint) {kolourpaint}
-         [exec] (ColorEdit) {kcoloredit}
-         [exec] (ColorPiker) {kcolorchooser}
-         [exec] (Rooler) {kruler}
-    [end]
-    [submenu] (Multimedia)
-         [exec] (Audio mixer) {kmix}
-         [exec] (Recorder) {krec}
-         [exec] (Player kboodle) {kaboodle}
-         [exec] (Player noatun) {noatun}
-         [exec] (Player juk) {juk}
-         [exec] (CD Player kscd) {kscd}
-         [exec] (CD Ripper) {kaudiocreator}
-         [separator]
-         [exec] (DVI) {kviewshell dvi}
-    [end]
-    [submenu] (Games)
-         [exec] (Pokker) {kpoker}
-         [exec] (Passiance) {kpat}
-         [exec] (Shi-sen-seo) {kshisen}
-         [exec] (Mahjong) {kmahjongg}
-         [exec] (Reversi) {kreversi}
-         [exec] (Sokoban) {ksokoban}
-         [exec] (Atomic) {katomic}
-         [exec] (Backgammon) {kbackgammon}
-         [exec] (Mineswiper) {kmines}
-         [exec] (Sea battle) {kbattleship}
-         [exec] (Color lines) {klines}
-         [exec] (Potato boy) {ktuberling}
-    [end]
-    [submenu] (System)
-         [exec] (Archivator ark) {ark}
-         [exec] (X-terminal) {xterm}
-         [exec] (K-konsole) {konsole}
-         [exec] (Run ...) {fbrun }
-         [exec] (vi) {xterm -e vi}
-         [exec] (Emacs) {emacs}
-         [exec] (Kate) {kate}
-         [exec] (Wallet) {kwalletmanager}
-         [exec] (Find file) {kfind}
-         [exec] (Disk info) {kdf}
-         [exec] (System monitor) {ksysguard}
-         [exec] (K-Cron) {kcron}
-         [exec] (Hex-edit) {khexedit}
-    [end]
-         [separator]
-         [exec] (reboot) {exec reboot}
-         [exec] (POWER-OFF) {exec poweroff}
-    [end]
-    
-
-And general configuration appearance file _/root/.fluxbox/init_ also can be created with following contents: 
-    
-    session.screen0.toolbar.maxOver:        false
-    session.screen0.toolbar.tools:  workspacename, prevworkspace, nextworkspace,  iconbar, systemtray, prevwindow, nextwindow, clock
-    session.screen0.toolbar.placement:      BottomCenter
-    session.screen0.toolbar.layer:  Desktop
-    session.screen0.toolbar.visible:        true
-    session.screen0.toolbar.height: 0
-    session.screen0.toolbar.autoHide:       false
-    session.screen0.toolbar.onTop:  False
-    session.screen0.toolbar.widthPercent:   66
-    session.screen0.toolbar.onhead: 0
-    session.screen0.overlay.lineWidth:      1
-    session.screen0.overlay.lineStyle:      LineSolid
-    session.screen0.overlay.joinStyle:      JoinMiter
-    session.screen0.overlay.capStyle:       CapNotLast
-    session.screen0.iconbar.mode:   Workspace
-    session.screen0.iconbar.alignment:      Relative
-    session.screen0.iconbar.iconWidth:      70
-    session.screen0.iconbar.usePixmap:      true
-    session.screen0.tab.rotatevertical:     True
-    session.screen0.tab.placement:  Top
-    session.screen0.tab.height:     16
-    session.screen0.tab.width:      64
-    session.screen0.tab.alignment:  Left
-    session.screen0.slit.direction: Vertical
-    session.screen0.slit.maxOver:   false
-    session.screen0.slit.autoHide:  false
-    session.screen0.slit.placement: BottomRight
-    session.screen0.slit.layer:     Dock
-    session.screen0.slit.onTop:     False
-    session.screen0.slit.onhead:    0
-    session.screen0.slit.alpha:     255
-    session.screen0.focusNewWindows:        true
-    session.screen0.menuDelay:      0
-    session.screen0.menuDelayClose: 0
-    session.screen0.focusModel:     ClickToFocus
-    session.screen0.opaqueMove:     false
-    session.screen0.workspacewarping:       true
-    session.screen0.menuAlpha:      255
-    session.screen0.rowPlacementDirection:  LeftToRight
-    session.screen0.imageDither:    false
-    session.screen0.windowMenu:
-    session.screen0.fullMaximization:       false
-    session.screen0.resizeMode:
-    session.screen0.focusLastWindow:        true
-    session.screen0.workspaces:     4

(Diff truncated)
bleh, cleanup
--- wikisrc/tutorials/how_to_stop_x11_from_listening_on_port_6000.mdwn	2021-03-31 07:09:52.998608455 +0000
+++ /dev/null	2021-03-31 07:09:05.820746369 +0000
@@ -1,23 +0,0 @@
-By default, the X server listens on port 6000 for incoming connections. If you are directly connected to the internet, or don't trust others connected to your LAN, this could be a potential security risk. 
-
-Disabling this can accomplished one of two ways. The first possible way is to run startx with the -nolisten tcp flag, i.e. 
-    
-    startx -- -nolisten tcp
-    
-
-The more permanent way to do it (globally) is to edit the startx script. It will be located at /usr/X11R6/bin/startx if you installed the base X11, or /usr/pkg/xorg/bin/startx if you installed X.org from pkgsrc. 
-
-Change the serverargs line to look like this: 
-    
-    serverargs="-nolisten tcp"
-    
-
-If you are not the administrator of the system or you like to let free the users to choose their configuration, edit (or create) the ~/.xserverrc file and put this line to it: 
-    
-    exec X -nolisten tcp
-    
-
-  
-Restart X, and you're all set! 
-
-

move to x11
--- wikisrc/tutorials/how_to_use_gtk_applications_with_lightweight_window_managers___42__box__44___e17__44___etc..mdwn	2021-03-31 07:04:32.259632011 +0000
+++ /dev/null	2021-03-31 07:04:06.388533869 +0000
@@ -1,24 +0,0 @@
-#  The problems
-
-After installing lightweight window managers, I noticed that some gtk applications didn't work ( thunar or nautilus, for example ) because of a dbus problem. Moreover, the gtk applications looked ugly, the icons didn't show up. 
-
-#  making dbus run
-
-You have to add the following line to /etc/rc.conf 
-    
-    dbus=YES
-    
-
-Don't forget to put the right dbus file in /etc/rc.d 
-    
-    cp /usr/pkg/share/examples/rc.d/dbus /etc/rc.d/dbus
-    
-
-#  choosing your gtk theme
-
-To solve the second problem, you need to create a .gtkrc-2.0 file in your home directory with the following lines : 
-    
-    gtk-theme-name = "Clearlooks"
-    gtk-icon-theme-name = "gnome"
-    
-
--- /dev/null	2021-03-31 07:04:06.388533869 +0000
+++ wikisrc/tutorials/x11/how_to_use_gtk_applications_with_lightweight_window_managers___42__box__44___e17__44___etc..mdwn	2021-03-31 07:04:32.294589664 +0000
@@ -0,0 +1,24 @@
+#  The problems
+
+After installing lightweight window managers, I noticed that some gtk applications didn't work ( thunar or nautilus, for example ) because of a dbus problem. Moreover, the gtk applications looked ugly, the icons didn't show up. 
+
+#  making dbus run
+
+You have to add the following line to /etc/rc.conf 
+    
+    dbus=YES
+    
+
+Don't forget to put the right dbus file in /etc/rc.d 
+    
+    cp /usr/pkg/share/examples/rc.d/dbus /etc/rc.d/dbus
+    
+
+#  choosing your gtk theme
+
+To solve the second problem, you need to create a .gtkrc-2.0 file in your home directory with the following lines : 
+    
+    gtk-theme-name = "Clearlooks"
+    gtk-icon-theme-name = "gnome"
+    
+

move some things to the x11 category
--- wikisrc/tutorials/how_to_blank_and_unblank_screens_on_lid_close__92__open.mdwn	2021-03-31 06:59:46.273929062 +0000
+++ /dev/null	2021-03-31 06:59:05.320279154 +0000
@@ -1,28 +0,0 @@
-The [[!template id=man name="powerd" section="8"]] daemon acts upon power management events posted by the kernel's power management facility, translating the events into a script name and arguments. These scripts are found in `/etc/powerd/scripts/`. 
-
-The `lid_switch` script is called on lid-open and -close events. An event of `pressed` means the lid has been closed, and `released` that the lid has been opened. 
-
-The following `lid_switch` uses [[!template id=man name="xset" section="1"]] to forcibly blank the screen on lid-close, and refresh the screen on lid-open: 
-    
-[[!template id=programlisting text="""
-    #!/bin/sh
-    # arguments passed by powerd(8): device event
-    # debugging: exec 1>>/tmp/lid_switch.log 2>&1
-    if [ -z "$DISPLAY" ]; then export DISPLAY=:0; fi
-    case "${2}" in
-     pressed)    # lid closed
-       /usr/X11R6/bin/xset dpms force off
-       exit 0
-       ;;
-     released)   # lid opened
-       # need to both force dpms and reset screensaver
-       /usr/X11R6/bin/xset dpms force on
-       /usr/X11R6/bin/xset s reset
-       exit 0
-       ;;
-     *)
-       logger -p warning "${0}: unsupported event ${2} on device ${1}" >&1
-       exit 1
-       ;;
-    esac
-"""]]
--- wikisrc/tutorials/how_to_customize_keyboard_mappings_in_x.mdwn	2021-03-31 06:59:46.303918099 +0000
+++ /dev/null	2021-03-31 06:59:05.320279154 +0000
@@ -1,100 +0,0 @@
-How to readjust your keyboard map to your liking. 
-
-**Contents**
-
-[[!toc]]
-
-#  Introduction 
-
-Sometimes, esp. when working in an X environment, the default keyboard layouts aren't enough... 
-
-#  xbindkeys 
-
-  * Program that allows you to launch shell commands with your keyboard or mouse under X. It links commands to keys or mouse buttons. 
-    
-      cd /usr/pkgsrc/x11/xbindkeys
-      make install clean
-    
-
-Create a default file 
-    
-      xbindkeys --defaults > $HOME/.xbindkeysrc
-    
-
-Grab a key code 
-    
-      xbindkeys -k
-    
-
-or 
-    
-      xbindkeys -mk
-    
-
-for multi-keys respectively. 
-
-##  Examples 
-
-  * .xbindkeysrc 
-    
-      # control+shift+d starts an xterm (it's a comment)
-      "xterm"
-        control+shift + q
-      # Menu key starts xbindkeys_show
-      "xbindkeys_show"
-        Menu
-      # Control + mouse button 1 starts an xterm
-      "xterm"
-        Control + b:1
-      # Control+Shift+a  release event starts rxvt
-      "rxvt"
-        release+control+shift + a
-      # Control + mouse button 2 release event starts rxvt
-      "rxvt"
-        Control + b:2 + Release
-    
-
-#  xmodmap 
-
-  * X utility for modifying keymaps and pointer button mappings. Call it from .xinitrc or .xsession, depending on whether you use 'startx' or the X display manager, like: 
-    
-       xmodmap ~/.xmodmaprc
-    
-
-##  German umlauts with en_US keyboards 
-
-  * I use the [right-Alt]+[vowel] key combination. For that, add the following to your .xmodmaprc 
-    
-       ! Alt_R + aAeEoOuUs für Umlaute auf US-Tastaturen.
-       clear mod1             
-       add mod1 = Alt_L             
-       add mod3 = Alt_R                
-       keysym Alt_R = Mode_switch               
-       keysym  u    = u U udiaeresis      Udiaeresis              
-       keysym  a    = a A adiaeresis      Adiaeresis              
-       keysym  o    = o O odiaeresis      Odiaeresis                
-       keysym  s    = s S ssharp            
-    
-
-##  Swap Caps_Lock and Control_L 
-
-  * This comes in handy esp. when using Emacs, screen and similar programs. 
-    
-      ! Swap Caps_Lock and Control_L
-      remove Lock = Caps_Lock
-      remove Control = Control_L
-      keysym Control_L = Caps_Lock
-      keysym Caps_Lock = Control_L
-      add Lock = Caps_Lock
-      add Control = Control_L
-    
-
-Alternatively you can add in the InputDevice section of your keyboard in /etc/X11/xorg.conf (dunno if Xfree.conf works): 
-    
-      Option  "XkbOptions"    "ctrl:swapcaps"
-    
-
-##  Mouse emulation mode with Num_Lock 
-    
-      remove Lock = Num_Lock
-      add Lock = Control+Mod2 + Num_Lock
--- wikisrc/tutorials/how_to_swap_cap_lock_with_escape.mdwn	2021-03-31 06:59:46.352269907 +0000
+++ /dev/null	2021-03-31 06:59:05.320279154 +0000
@@ -1,9 +0,0 @@
-#  Esc <-> Caps 
-
-The original Unix terminals (or at least the one vi(1) written on) had the esc key somewhere around the tab on PC keyboards. This makes sense if you think about vi's commands. 
-
-Well, we need tab, but most of us don't use the caps key, so we can just swap them right away. 
-
-You can add the following to your `~/.xinitrc` file, or run as a command: 
-    
-    setxkbmap -option "caps:swapescape"
--- wikisrc/tutorials/how_to_use_anti-aliased_fonts_in_linux_emulation.mdwn	2021-03-31 06:59:46.386594793 +0000
+++ /dev/null	2021-03-31 06:59:05.320279154 +0000
@@ -1,51 +0,0 @@
-**Contents**
-
-[[!toc levels=2]]
-
-#  Introduction
-
-This problem is most common when someone installs a browser in linux emulation, for example www/opera which is only avalible through linux_compat. 
-
-#  Fixing the problem
-
-The problem is, that the emulated Linux system's font cache is empty, thus you can't use your fonts installed in NetBSD. Its quite easy to fix actualy. 
-
-##  Installing Linux fontconfig
-
-Look for which package you will need: 
-    
-    $ pkgfind fontconfig|grep ^emulators
-    emulators/suse100_32_fontconfig
-    emulators/suse100_fontconfig: Linux compatibility package for fontconfig
-    emulators/suse91_32_fontconfig
-    emulators/suse91_fontconfig: Linux compatibility package for fontconfig
-    
-
-You will need _emulators/suse100_fontconfig_ on i386 and _suse100_32_fontconfig_ on amd64 architecture. **FIXME**
-
-Install it from packages or from pkgsrc. You can find more on installing in the documention or in the wiki. 
-
-##  Running fc-cache
-
-The only thing you have to do after installing it is the following: 
-    
-    /usr/pkg/emul/linux/usr/bin/fc-cache
-    
-
-It will regenerate the font cache in the compat system. 
-
-To ensure fonts have been cached in the compat system, you can use the following command : 
-    
-    /usr/pkg/emul/linux/usr/bin/fc-list
-    
-
-You may use your fonts antialiased with linux_compat now 
-
-##  If it doesn't work
-
-Still ugly fonts? 
-
-If you use modular xorg, you may also need to link /usr/pkg to /usr/X11R6 : 
-    
-     ln -s /usr/pkg /usr/X11R6
-    

(Diff truncated)
all of this information is out of date and wrong now, remove
--- wikisrc/tutorials/how_to_use_5.1_surround_sound_with_netbsd.mdwn	2021-03-31 06:41:38.833825531 +0000
+++ /dev/null	2021-03-31 06:41:06.138029864 +0000
@@ -1,190 +0,0 @@
-**Contents**
-
-[[!toc levels=3]]
-
-#  System Requirements 
-
-  * You will need a 5.1 Capable soundcard. 
-  * [NetBSD/i386](Hardware/i386) or [NetBSD/amd64](Hardware/amd64) 2.0 or higher 
-  * mplayer or xine software from pkgsrc. 
-
-#  Configuration 
-
-The soundcard should have been automatically configured by the kernel. The audiolayer is configured by 
-
-  * [[!template id=man name="audioctl" section="1"]]
-  * [[!template id=man name="mixerctl" section="1"]]
-  
-##  Syntax 
-
-The syntax of audioctl and mixerctl are the same. 
-    
-    % mixerctl
-    mixerctl [-d file] [-v] [-n] name ...
-    mixerctl [-d file] [-v] [-n] -w name=value ...
-    mixerctl [-d file] [-v] [-n] -a
-    %
-    
-
-##  Avaible command-line arguments 
-
-##  audioctl 
-    
-    % audioctl -a
-    name=VIA VT8233/8235
-    version=0x50
-    config=auvia encodings=ulinear:8,mulaw:8*,alaw:8*,slinear:8*,slinear_le:16,ulinear_le:16*,slinear_be:16*,ulinear_be:16* 
-    properties=full_duplex,mmap,independent
-    full_duplex=0
-    fullduplex=0
-    blocksize=16384
-    hiwat=4
-    lowat=3
-    monitor_gain=0
-    mode=play
-    play.rate=48000
-    play.channels=4
-    play.precision=16
-    play.encoding=slinear_le
-    play.gain=191
-    play.balance=32
-    play.port=0x0
-    play.avail_ports=0x0
-    play.seek=49152
-    play.samples=254935040
-    play.eof=3509
-    play.pause=0
-    play.error=1
-    play.waiting=0
-    play.open=1
-    play.active=1
-    play.buffer_size=65536
-    record.rate=48000
-    record.channels=2
-    record.precision=16
-    record.encoding=slinear_le
-    record.gain=0
-    record.balance=32
-    record.port=0x1
-    record.avail_ports=0x7
-    record.seek=0
-    record.samples=0
-    record.eof=0
-    record.pause=0
-    record.error=0
-    record.waiting=0
-    record.open=0
-    record.active=0
-    record.buffer_size=65536
-    record.errors=0
-    %
-    
-
-##  mixerctl
-    
-    % mixerctl -a
-    outputs.master=191,191
-    outputs.master.mute=off
-    outputs.mono=255
-    outputs.mono.mute=on
-    outputs.mono.source=mixerout
-    outputs.surround=255,255
-    outputs.surround.mute=off
-    outputs.surround.lineinjack=on
-    outputs.surround.mixtofront=on
-    outputs.center=127
-    outputs.center.mute=off
-    outputs.center.micjack=on
-    outputs.center.mixtofront=on
-    outputs.lfe=127
-    outputs.lfe.mute=off
-    outputs.lfe.micjack=on
-    outputs.lfe.mixtofront=on
-    inputs.speaker=255
-    inputs.speaker.mute=off
-    inputs.phone=191
-    inputs.phone.mute=on
-    inputs.mic=191
-    inputs.mic.mute=on
-    inputs.mic.preamp=off
-    inputs.mic.source=mic0
-    inputs.line=191,191
-    inputs.line.mute=off
-    inputs.cd=191,191
-    inputs.cd.mute=off
-    inputs.video=191,191
-    inputs.video.mute=off
-    inputs.aux=191,191
-    inputs.aux.mute=off
-    inputs.dac=151,151
-    inputs.dac.mute=off
-    record.source=mic
-    record.volume=0,0
-    record.volume.mute=off
-    outputs.spatial=off
-    outputs.spatial.center=0
-    outputs.spatial.depth=0
-    %
-    
-
-##  Required adjustments
-
-##  Dolby Digital 4.1
-    
-    % audioctl -w play.channels=4
-    % mixerctl -w outputs.master=200,200
-    % mixerctl -w outputs.surround.lineinjack=on
-    % mixerctl -w outputs.surround.mixtofront=on
-    % mixerctl -w outputs.surround=200,200
-    
-
-You should put this into your /etc/rc.conf 
-
-##  Dolby Digital 5.1
-    
-    % audioctl -w play.channels=6
-    % mixerctl -w outputs.master=200,200 
-    % mixerctl -w outputs.surround.lineinjack=on
-    % mixerctl -w outputs.surround.mixtofront=on
-    % mixerctl -w outputs.surround=200,200
-    % mixerctl -w outputs.center=200
-    % mixerctl -w outputs.center.micjack=on
-    % mixerctl -w outputs.center.mixtofront=on
-    % mixerctl -w outputs.lfe=200
-    % mixerctl -w outputs.lfe.micjack=on
-    % mixerctl -w outputs.lfe.mixtofront=on
-    
-
-You should put this also into your /etc/rc.conf 
-
-#  Supported Players
-
-##  Mplayer
-
-Currently mplayer has the best surround sound support. For 4.1 run 
-    
-    mplayer -channels 4
-    
-
-and for 5.1 
-    
-    mplayer -channels 6
-    
-
-##  Xine
-
-Unfortunately **mplayer** isn't able to handle DTS recorded DVD's. The required libdts (renamed due license restrictions to libdca) is not within the Packages Collection and if you believe several mailinglists it runs currently only on linux. But **xine** with the sun soundriver works fine. At first you have to make some adjustments, because the sound on DTS-DVD's is sampled at 24000 Hz and not 48000 Hz as a normal stereo DVD's. 
-    
-    $ mixerctl -w outputs.surround.lineinjack=on
-    $ mixerctl -w outputs.surround.mixtofront=on
-    $ mixerctl -w outputs.master=200,200
-    $ mixerctl -w outputs.surround=200,200
-    $ audioctl -w play.channels=4
-    $ audioctl -w play.rate=24000
-    
-
-#  Additional Information 
-
-  * [[!template id=man name="audioctl" section="1"]] Manpage 
-  * [[!template id=man name="mixerctl" section="1"]] Manpage 
-

add meta title
Index: wikisrc/tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer.md
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer.md,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer.md	31 Mar 2021 06:20:45 -0000	1.1
+++ wikisrc/tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer.md	31 Mar 2021 06:32:27 -0000	1.2
@@ -1,3 +1,5 @@
+[[[!meta title="How to use Xorg's wsfb display driver with a UEFI/BIOS framebuffer, and change its resolution"]]
+
 How to use Xorg's wsfb display driver with a UEFI/BIOS framebuffer, and change its resolution
 =============================================================================================
 

Index: wikisrc/opensoundsystem.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/opensoundsystem.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/opensoundsystem.mdwn	4 Jul 2010 00:40:06 -0000	1.6
+++ wikisrc/opensoundsystem.mdwn	31 Mar 2021 06:30:53 -0000	1.7
@@ -4,6 +4,12 @@
 
 This page shows the progress of the porting of OSSv4 to NetBSD.
 
+## Update
+
+It's not known if anyone is continuing to work on a native port of OSSv4, but this page is kept for archival purposes.
+
+NetBSD 10 should have greater compatibility with OSSv4 via the userspace translation layer [ossaudio(3)](///man.netbsd.org/ossaudio.3), and the native audio system [audio(4)](man.netbsd.org/audio.4) is still preferred.
+
 ## Version
 
 The current version is v4.2 (hg-889)

fix hyperlink
Index: wikisrc/tutorials.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials.mdwn,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wikisrc/tutorials.mdwn	31 Mar 2021 06:20:45 -0000	1.44
+++ wikisrc/tutorials.mdwn	31 Mar 2021 06:22:54 -0000	1.45
@@ -4,7 +4,7 @@
 * [[X11]]
 * [[Services]]
 * [[Installation on UEFI systems]]
-* [X11 with the wsfb UEFI/BIOS framebuffer display driver](./tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer)
+* [X11 with the wsfb UEFI/BIOS framebuffer display driver](./x11/how_to_use_wsfb_uefi_bios_framebuffer)
 
 ## Guide and HOWTOs
 * [Root on ZFS](../wiki/RootOnZFS/)

move RVP's tutorial to the correct place and index it
Index: wikisrc/tutorials.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials.mdwn,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- wikisrc/tutorials.mdwn	29 Sep 2020 17:29:21 -0000	1.43
+++ wikisrc/tutorials.mdwn	31 Mar 2021 06:20:45 -0000	1.44
@@ -4,6 +4,7 @@
 * [[X11]]
 * [[Services]]
 * [[Installation on UEFI systems]]
+* [X11 with the wsfb UEFI/BIOS framebuffer display driver](./tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer)
 
 ## Guide and HOWTOs
 * [Root on ZFS](../wiki/RootOnZFS/)
--- wikisrc/tutorials/how_to_use_wsfb_uefi_bios_framebuffer.md	2021-03-31 06:21:23.873122395 +0000
+++ /dev/null	2021-03-31 06:21:05.804435847 +0000
@@ -1,200 +0,0 @@
-How to use the Xorg wsfb framebuffer display driver, and change its resolution
-==============================================================================
-
-### Background
-[wsfb(4)](https://man.netbsd.org/wsfb.4) is the Xorg graphics driver for the NetBSD [wsdisplay(4)](https://man.netbsd.org/wsdisplay.4) framebuffer device. `wsdisplay(4)`, similar to Linux's `/dev/fb` devices, provide access to _non-accelerated_ framebuffers, which are provided by _almost all_ modern cards. Most, if not all, _modern_ graphics cards provide what's called a _linear_ framebuffer: a chunk of memory where contiguous address locations map onto adjacent (X, Y) _pixels_. For example, assuming a 32 bits-per-pixel colour depth display, memory location `fbmem + 0` will hold the pixel at position (0,0); `fbmem + 4` corresponds to the pixel at (1, 0), and so on. (We'll skip the complication known as `stride` or `line_length` here.)
-
-`wsdisplay(4)` can run on top of: 
-
-1. `genfb(4)`, the Generic PCI VGA framebuffer device (provided by UEFI or BIOS on x86), and other simple software framebuffers provided by hardware or firmware (e.g. simplefb on ARM)
-2. the accelerated [`drm(4)`](https://man.netbsd.org/drm.4) graphics devices (in `/dev/dri/card?`--which `wsfb` will use as a plain framebuffer).
-
-### Using `wsfb`
-### Step 1: Configuring `Xorg`
-Use this `wsfb.conf` Xorg config fragment:
- 
-```
-Section "Device"
-	Identifier  "Card0"
-	Driver      "wsfb"
-EndSection
-```
-
-That is all that is needed. Xorg will autoconfigure everything else. Make sure you dump the `wsfb.conf` file into the correct Xorg config. directory. `/etc/X11/xorg.conf.d/` is the correct location for the Xorg in base. If you've installed the `modular-xorg` package, then the path will need change. Use this command to find your `config directory`:
-```
-$ fgrep directory /var/log/Xorg.0.log
-[    72.697] (==) Using config directory: "/usr/local/etc/X11/xorg.conf.d"
-[    72.697] (==) Using system config directory "/usr/local/share/X11/xorg.conf.d"
-```
-
-If your DRM kernel driver has loaded OK and is active, then it will have configured your graphics card with the best resolution for your screen and you can just run `X` right away (this wil be X with `wsfb` on `drmkms`, minus the DRM-provided accelerations). You don't need Step 2.
-
-If you don't have a DRM driver, or if you can't load it, then if you start `X` now, you'll most probably get the bog-standard 1024x768x32 screen resolution provided by `genfb`, which might be OK, but, is not ideal. As the `wsfb`/`wsdisplay`/`genfb` combo. doesn't let you change resolutions on the fly (`xrandr`, for instance, doesn't work), we'll have to set a better resolution elsewhere: in the bootloader.
-
-### Step 2: Setting a better display mode.
-Reboot, then at the bootloader menu, choose the option to get to the bootloader prompt. Here, on UEFI systems, we use the `gop` (Graphics Output Protocol) command like this:
-List avaibable video modes first:
-```
-> gop list
- 0: 1366x768 BGRR pitch 1376 bpp 32
- 1: 640x480 BGRR pitch 640 bpp 32
-*2: 800x600 BGRR pitch 800 bpp 32
- 3: 1024x768 BGRR pitch 1024 bpp 32
->
-```
-The `*` indicates the (safe) mode that the bootloader will use by default. Note that on my laptop, mode `0` has a pitch (aka stride) of 1376 pixels. This means that on my graphics card (Asus X202E laptop), the framebuffer is _linear_, but, **not** fully contiguous. The 10 unusable pixels at the end of each row have to taken into account, or else, you'll be treated to a characteristic jagged, streaky display.
-
-Choose the best mode, which is generally mode `0`:
-```
-> gop 0
->
-```
-The screen resolution will switch immediately. (And hopefully, your display won't go blank, which, these days, usually indicates a graphics card/BIOS/UEFI/whatever that doesn't implement the published standards correctly.)
-
-If you have/use BIOS instead of UEFI, you can try the `vesa` command instead of `gop`:
-
-```
-> vesa list
-...
-> vesa 0xhhh
->
-```
-If the mode you've chosen works, then you can add that `gop 0` or `vesa mode` command to `boot.cfg` so that it is activated automatically.
-
-This is what `dmesg` will show, if you've disabled DRM (see below), or don't have it:
-```
-$ dmesg | fgrep genfb
-[     1.015430] genfb0 at pci0 dev 2 function 0: vendor 8086 product 0166 (rev. 0x09)
-[     1.015430] genfb0: framebuffer at 0xe0000000, size 1366x768, depth 32, stride 5504
-[     1.015430] genfb0: shadow framebuffer enabled, size 4128 KB
-[     1.015430] wsdisplay0 at genfb0 kbdmux 1: console (default, vt100 emulation), using wskbd0
-[     1.015430] drm at genfb0 not configured
-```
-The resolution, depth and stride are all OK. And inside the Xorg server:
-```
-$ xdpyinfo | fgrep -B1 -A1 resolution
-  dimensions:    1366x768 pixels (310x174 millimeters)
-  resolution:    112x112 dots per inch
-  depths (7):    24, 1, 4, 8, 15, 16, 32
-$ xrandr
-xrandr: Failed to get size of gamma for output default
-Screen 0: minimum 1366 x 768, current 1366 x 768, maximum 1366 x 768
-default connected 1366x768+0+0 0mm x 0mm
-   1366x768       0.00* 
-$
-```
-
-### Limitations
-1. No OpenGL hardware acceleration - on x86 and aarch64, llvmpipe (a parallel CPU-based just-in-time renderer) will be used instead
-2. No X Display Power Management Signaling
-3. No X video extension (used for accelerated video playback)
-4. No DRI
-
-#### Extra: How to disable built-in DRM driver using kernel's `userconf` manager
-
-For testing, or if running `wsfb` on top of the DRM graphics driver does not work--it mostly should, actually).
-
-At the bootloader prompt, pass the `-c` flag to the kernel:
-```
-> boot -c
-```
-The kernel will display a few lines, then immediately drop into the `userconf` prompt:
-```
-uc> list                        # list all devs; look for your drmkms entry
-uc> disable i915drmkms          # disable Intel DRM
-uc> quit
-```
-Once you've determined the device name using `userconf`, or, by trawling through the GENERIC kernel config file, you can disable the device using the bootloader like this:
-```
-> userconf disable i915drmkms
-```
-You can of course, add `userconf` commands also to `boot.conf`
-
-#### Minimal `wsfb(4)` config fragment `/etc/X11/xorg.conf.d/wsfb.conf`
-```
-Section "Device"
-	Identifier  "Card0"
-	Driver      "wsfb"
-EndSection
-```
-
-#### Minimal `wsfb(4)` `/etc/X11/xorg.conf` created using `X -configure`, and then changing the graphics device driver (`Section "Device"`) from `intel` to `wsfb`
-
-```
-Section "ServerLayout"
-	Identifier     "X.org Configured"
-	Screen      0  "Screen0" 0 0
-	InputDevice    "Mouse0" "CorePointer"
-	InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "Files"
-	ModulePath   "/usr/X11R7/lib/modules"
-	FontPath     "/usr/X11R7/lib/X11/fonts/misc/"
-	FontPath     "/usr/X11R7/lib/X11/fonts/TTF/"
-	FontPath     "/usr/X11R7/lib/X11/fonts/Type1/"
-	FontPath     "/usr/X11R7/lib/X11/fonts/75dpi/"
-	FontPath     "/usr/X11R7/lib/X11/fonts/100dpi/"
-EndSection
-
-Section "Module"
-	Load  "dri"
-	Load  "dri2"
-	Load  "glx"
-	Load  "shadow"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Keyboard0"
-	Driver      "kbd"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Mouse0"
-	Driver      "mouse"
-	Option	    "Protocol" "wsmouse"
-	Option	    "Device" "/dev/wsmouse"
-	Option	    "ZAxisMapping" "4 5 6 7"
-EndSection
-
-Section "Monitor"
-	Identifier   "Monitor0"
-	VendorName   "Monitor Vendor"
-	ModelName    "Monitor Model"
-EndSection
-
-Section "Device"
-	Identifier  "Card0"
-	Driver      "wsfb"
-EndSection
-
-Section "Screen"
-	Identifier "Screen0"
-	Device     "Card0"
-	Monitor    "Monitor0"
-	SubSection "Display"
-		Viewport   0 0
-		Depth     1
-	EndSubSection
-	SubSection "Display"
-		Viewport   0 0
-		Depth     4

(Diff truncated)
Add wsfb tutorial, from RVP
--- /dev/null	2021-03-31 06:12:06.412029987 +0000
+++ wikisrc/tutorials/how_to_use_wsfb_uefi_bios_framebuffer.md	2021-03-31 06:12:11.508779776 +0000
@@ -0,0 +1,200 @@
+How to use the Xorg wsfb framebuffer display driver, and change its resolution
+==============================================================================
+
+### Background
+[wsfb(4)](https://man.netbsd.org/wsfb.4) is the Xorg graphics driver for the NetBSD [wsdisplay(4)](https://man.netbsd.org/wsdisplay.4) framebuffer device. `wsdisplay(4)`, similar to Linux's `/dev/fb` devices, provide access to _non-accelerated_ framebuffers, which are provided by _almost all_ modern cards. Most, if not all, _modern_ graphics cards provide what's called a _linear_ framebuffer: a chunk of memory where contiguous address locations map onto adjacent (X, Y) _pixels_. For example, assuming a 32 bits-per-pixel colour depth display, memory location `fbmem + 0` will hold the pixel at position (0,0); `fbmem + 4` corresponds to the pixel at (1, 0), and so on. (We'll skip the complication known as `stride` or `line_length` here.)
+
+`wsdisplay(4)` can run on top of: 
+
+1. `genfb(4)`, the Generic PCI VGA framebuffer device (provided by UEFI or BIOS on x86), and other simple software framebuffers provided by hardware or firmware (e.g. simplefb on ARM)
+2. the accelerated [`drm(4)`](https://man.netbsd.org/drm.4) graphics devices (in `/dev/dri/card?`--which `wsfb` will use as a plain framebuffer).
+
+### Using `wsfb`
+### Step 1: Configuring `Xorg`
+Use this `wsfb.conf` Xorg config fragment:
+ 
+```
+Section "Device"
+	Identifier  "Card0"
+	Driver      "wsfb"
+EndSection
+```
+
+That is all that is needed. Xorg will autoconfigure everything else. Make sure you dump the `wsfb.conf` file into the correct Xorg config. directory. `/etc/X11/xorg.conf.d/` is the correct location for the Xorg in base. If you've installed the `modular-xorg` package, then the path will need change. Use this command to find your `config directory`:
+```
+$ fgrep directory /var/log/Xorg.0.log
+[    72.697] (==) Using config directory: "/usr/local/etc/X11/xorg.conf.d"
+[    72.697] (==) Using system config directory "/usr/local/share/X11/xorg.conf.d"
+```
+
+If your DRM kernel driver has loaded OK and is active, then it will have configured your graphics card with the best resolution for your screen and you can just run `X` right away (this wil be X with `wsfb` on `drmkms`, minus the DRM-provided accelerations). You don't need Step 2.
+
+If you don't have a DRM driver, or if you can't load it, then if you start `X` now, you'll most probably get the bog-standard 1024x768x32 screen resolution provided by `genfb`, which might be OK, but, is not ideal. As the `wsfb`/`wsdisplay`/`genfb` combo. doesn't let you change resolutions on the fly (`xrandr`, for instance, doesn't work), we'll have to set a better resolution elsewhere: in the bootloader.
+
+### Step 2: Setting a better display mode.
+Reboot, then at the bootloader menu, choose the option to get to the bootloader prompt. Here, on UEFI systems, we use the `gop` (Graphics Output Protocol) command like this:
+List avaibable video modes first:
+```
+> gop list
+ 0: 1366x768 BGRR pitch 1376 bpp 32
+ 1: 640x480 BGRR pitch 640 bpp 32
+*2: 800x600 BGRR pitch 800 bpp 32
+ 3: 1024x768 BGRR pitch 1024 bpp 32
+>
+```
+The `*` indicates the (safe) mode that the bootloader will use by default. Note that on my laptop, mode `0` has a pitch (aka stride) of 1376 pixels. This means that on my graphics card (Asus X202E laptop), the framebuffer is _linear_, but, **not** fully contiguous. The 10 unusable pixels at the end of each row have to taken into account, or else, you'll be treated to a characteristic jagged, streaky display.
+
+Choose the best mode, which is generally mode `0`:
+```
+> gop 0
+>
+```
+The screen resolution will switch immediately. (And hopefully, your display won't go blank, which, these days, usually indicates a graphics card/BIOS/UEFI/whatever that doesn't implement the published standards correctly.)
+
+If you have/use BIOS instead of UEFI, you can try the `vesa` command instead of `gop`:
+
+```
+> vesa list
+...
+> vesa 0xhhh
+>
+```
+If the mode you've chosen works, then you can add that `gop 0` or `vesa mode` command to `boot.cfg` so that it is activated automatically.
+
+This is what `dmesg` will show, if you've disabled DRM (see below), or don't have it:
+```
+$ dmesg | fgrep genfb
+[     1.015430] genfb0 at pci0 dev 2 function 0: vendor 8086 product 0166 (rev. 0x09)
+[     1.015430] genfb0: framebuffer at 0xe0000000, size 1366x768, depth 32, stride 5504
+[     1.015430] genfb0: shadow framebuffer enabled, size 4128 KB
+[     1.015430] wsdisplay0 at genfb0 kbdmux 1: console (default, vt100 emulation), using wskbd0
+[     1.015430] drm at genfb0 not configured
+```
+The resolution, depth and stride are all OK. And inside the Xorg server:
+```
+$ xdpyinfo | fgrep -B1 -A1 resolution
+  dimensions:    1366x768 pixels (310x174 millimeters)
+  resolution:    112x112 dots per inch
+  depths (7):    24, 1, 4, 8, 15, 16, 32
+$ xrandr
+xrandr: Failed to get size of gamma for output default
+Screen 0: minimum 1366 x 768, current 1366 x 768, maximum 1366 x 768
+default connected 1366x768+0+0 0mm x 0mm
+   1366x768       0.00* 
+$
+```
+
+### Limitations
+1. No OpenGL hardware acceleration - on x86 and aarch64, llvmpipe (a parallel CPU-based just-in-time renderer) will be used instead
+2. No X Display Power Management Signaling
+3. No X video extension (used for accelerated video playback)
+4. No DRI
+
+#### Extra: How to disable built-in DRM driver using kernel's `userconf` manager
+
+For testing, or if running `wsfb` on top of the DRM graphics driver does not work--it mostly should, actually).
+
+At the bootloader prompt, pass the `-c` flag to the kernel:
+```
+> boot -c
+```
+The kernel will display a few lines, then immediately drop into the `userconf` prompt:
+```
+uc> list                        # list all devs; look for your drmkms entry
+uc> disable i915drmkms          # disable Intel DRM
+uc> quit
+```
+Once you've determined the device name using `userconf`, or, by trawling through the GENERIC kernel config file, you can disable the device using the bootloader like this:
+```
+> userconf disable i915drmkms
+```
+You can of course, add `userconf` commands also to `boot.conf`
+
+#### Minimal `wsfb(4)` config fragment `/etc/X11/xorg.conf.d/wsfb.conf`
+```
+Section "Device"
+	Identifier  "Card0"
+	Driver      "wsfb"
+EndSection
+```
+
+#### Minimal `wsfb(4)` `/etc/X11/xorg.conf` created using `X -configure`, and then changing the graphics device driver (`Section "Device"`) from `intel` to `wsfb`
+
+```
+Section "ServerLayout"
+	Identifier     "X.org Configured"
+	Screen      0  "Screen0" 0 0
+	InputDevice    "Mouse0" "CorePointer"
+	InputDevice    "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+	ModulePath   "/usr/X11R7/lib/modules"
+	FontPath     "/usr/X11R7/lib/X11/fonts/misc/"
+	FontPath     "/usr/X11R7/lib/X11/fonts/TTF/"
+	FontPath     "/usr/X11R7/lib/X11/fonts/Type1/"
+	FontPath     "/usr/X11R7/lib/X11/fonts/75dpi/"
+	FontPath     "/usr/X11R7/lib/X11/fonts/100dpi/"
+EndSection
+
+Section "Module"
+	Load  "dri"
+	Load  "dri2"
+	Load  "glx"
+	Load  "shadow"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Keyboard0"
+	Driver      "kbd"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Mouse0"
+	Driver      "mouse"
+	Option	    "Protocol" "wsmouse"
+	Option	    "Device" "/dev/wsmouse"
+	Option	    "ZAxisMapping" "4 5 6 7"
+EndSection
+
+Section "Monitor"
+	Identifier   "Monitor0"
+	VendorName   "Monitor Vendor"
+	ModelName    "Monitor Model"
+EndSection
+
+Section "Device"
+	Identifier  "Card0"
+	Driver      "wsfb"
+EndSection
+
+Section "Screen"
+	Identifier "Screen0"
+	Device     "Card0"
+	Monitor    "Monitor0"
+	SubSection "Display"
+		Viewport   0 0
+		Depth     1
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     4
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     8
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     15
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     16
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     24

(Diff truncated)
Fix a typo.
Noticed by <pgoyette>, thanks!
Members: 
	events.mdwn:1.90->1.91 

Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- wikisrc/events.mdwn	28 Mar 2021 20:43:55 -0000	1.90
+++ wikisrc/events.mdwn	28 Mar 2021 20:49:09 -0000	1.91
@@ -1,7 +1,7 @@
 [[!meta title="Events"]]
 
 For list of NetBSD-related events please see
-[NetBSD Eveents](//www.NetBSD.org/gallery/events.html).
+[NetBSD Events](//www.NetBSD.org/gallery/events.html).
 
 If you know about some public event that fits and would like it to be
 listed there, [contact us.](//www.NetBSD.org/cgi-bin/feedback.cgi)

Redirect the reader to www.NetBSD.org NetBSD Events page and avoid all the
copypastos between the two.
For the last years all the contents were duplicate between these two pages but
it is probably better to stick to the one on htdocs given that they are also
easily linked to the NetBSD.org homepage unlike the ones in wikisrc.
Members: 
	events.mdwn:1.89->1.90 

Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- wikisrc/events.mdwn	9 Jun 2020 09:36:21 -0000	1.89
+++ wikisrc/events.mdwn	28 Mar 2021 20:43:55 -0000	1.90
@@ -1,5092 +1,12 @@
 [[!meta title="Events"]]
 
-This is an incomplete list of NetBSD-related events. If you know about
-some public event that fits and would like it to be listed here,
-[contact us.](//www.NetBSD.org/cgi-bin/feedback.cgi)
+For list of NetBSD-related events please see
+[NetBSD Eveents](//www.NetBSD.org/gallery/events.html).
+
+If you know about some public event that fits and would like it to be
+listed there, [contact us.](//www.NetBSD.org/cgi-bin/feedback.cgi)
 
 For a list of NetBSD-related presentations, please check out our
 [presentation pages](//www.NetBSD.org/gallery/presentations/).
 
 See also the NetBSD [[developer summits|summits]].
-
-
-Future Events
--------------
-
-
-Past Events
------------
-### `Jun 2020` - BSDCan 2020, Ottawa, Canada
-
-*June 3 - 6, 2020, University of Ottawa, Ottawa, Canada*
-
-[BSDCan](https://www.bsdcan.org/2020/), a BSD conference held in
-Ottawa, Canada, quickly established itself as the technical conference
-for people working on and with 4.4BSD based operating systems and
-related projects. The organizers have found a fantastic formula
-that appeals to a wide range of people from extreme novices to
-advanced developers.
-
-
-### `Feb 2020` - FOSDEM 2020 Brussels, Belgium
-
-*February 1 - 2, 2020, ULB Solbosch Campus, Brussels, Belgium*
-
-[FOSDEM](https://fosdem.org/2020/) is a
-free event for software developers to meet, share ideas
-and collaborate. Every year, thousands of developers of
-free and open source software from all over the world gather
-at the event in Brussels.
-
-There is a special developer's room reserved for BSD licensed
-operating systems and their talks.
-
-Please see
-[this announcement](//mail-index.NetBSD.org/netbsd-advocacy/2019/10/10/msg000816.html)
-for details.
-
-
-### `Sep 2019` - EuroBSDcon 2019, Lillehammer, Norway
-
-*September 19 - 22, 2019, Scandic Lillehammer Hotel, Lillehammer, Norway*
-
-[EuroBSDcon](https://2019.eurobsdcon.org/) is the premier European
-conference on the open source BSD operating systems attracting
-about 300 highly skilled engineering professionals, software
-developers, computer science students and professors, and users
-from all over Europe and other parts of the world. The goal of
-EuroBSDcon is to exchange knowledge about the BSD operating systems,
-facilitate coordination and cooperation among users and developers.
-
-
-### `Jul 2019` - pkgsrcCon 2019, Cambridge, United Kingdom
-
-*July 13 - 14, 2019, Cambridge, United Kingdom*
-
-[pkgsrcCon](//pkgsrc.org/pkgsrcCon/2019/) is the annual technical
-conference for people working on pkgsrc, a framework for building
-over 19,000 open source software packages.
-pkgsrc is the native package manager on NetBSD, SmartOS and Minix, and
-is portable across many different operating systems including Linux and
-Mac OS X.
-
-
-### `May 2019` - BSDCan 2019, Ottawa, Canada
-
-*May 15 - 18, 2019, University of Ottawa, Ottawa, Canada*
-
-[BSDCan](https://www.bsdcan.org/2019/), a BSD conference held in
-Ottawa, Canada, quickly established itself as the technical conference
-for people working on and with 4.4BSD based operating systems and
-related projects. The organizers have found a fantastic formula
-that appeals to a wide range of people from extreme novices to
-advanced developers.
-
-
-### `Mar 2019` - AsiaBSDCon 2019, Tokyo, Japan
-
-*March 21 - 24, Tokyo University of Science, Tokyo, Japan*
-
-[AsiaBSDCon](https://www.asiabsdcon.org/) is a
-conference for users and developers on BSD based systems.
-The conference is for anyone developing, deploying and using systems
-based on FreeBSD, NetBSD, OpenBSD, DragonFly BSD, Darwin, and MacOS X.
-AsiaBSDCon is a technical conference and aims to collect the best
-technical papers and presentations available to ensure that the latest
-developments in our open source community are shared with the widest
-possible audience.
-
-
-### `Feb 2019` - FOSDEM 2019 Brussels, Belgium
-
-*February 2 - 3, 2019, ULB Solbosch Campus, Brussels, Belgium*
-
-[FOSDEM](https://fosdem.org/2019/) is a
-free event for software developers to meet, share ideas
-and collaborate. Every year, thousands of developers of
-free and open source software from all over the world gather
-at the event in Brussels.
-
-There is a special developer's room reserved for BSD licensed
-operating systems and their talks.
-
-Please see
-[this announcement](https://mail-index.NetBSD.org/netbsd-advocacy/2018/10/24/msg000787.html)
-for details.
-
-
-### `Oct 2018` - MeetBSDCA 2018, Santa Clara, US
-
-*October 19 - 20, 2018, Intel Santa Clara Campus, California, US*
-
-[MeetBSD California](https://www.meetbsd.com/) is a biennial BSD
-Unix conference that takes place in Silicon Valley. The first
-MeetBSD California took place in 2008 and in 2018 it will take
-place at the Intel Santa Clara Campus.
-
-
-### `Sep 2018` - EuroBSDCon 2018, Bucharest, Romania
-
-*September 20 - 23, 2018, University Politehnica of Bucharest, Romania*
-
-[EuroBSDCon](https://2018.eurobsdcon.org/) is the premier European
-conference on the open source BSD operating systems attracting
-about 300 highly skilled engineering professionals, software
-developers, computer science students and professors, and users
-from all over Europe and other parts of the world. The goal of
-EuroBSDcon is to exchange knowledge about the BSD operating systems,
-facilitate coordination and cooperation among users and developers.
-
-
-### `Jul 2018` - Japan NetBSD Users Group annual Meeting and BoF, Tokyo, Japan
-
-*July 14, 2018, Takeda Building, The University of Tokyo, Japan*
-
-[Japan NetBSD User Group annual Meeting and BoF](http://www.jp.netbsd.org/ja/JP/JNUG/announce/meeting20.html.en)
-is the 20th annual meeting organized by the
-[Japan NetBSD Users Group](http://www.jp.netbsd.org/ja/JP/JNUG/).
-The meeting consists of the 20th Annual Meeting opened to all
-members of JNUG and the NetBSD BoF (Birds of a Feather), the casual
-meeting for individuals who have interests to the NetBSD operating
-system opened to everybody interested.
-
-For more information please see the report on
-[netbsd-advocacy@](//mail-index.netbsd.org/netbsd-advocacy/2018/07/17/msg000778.html)
-mailing list.
-
-
-### `Jul 2018` - pkgsrcCon 2018, Berlin, Germany
-
-*July 7 - 8, 2018, Berlin, Germany*
-
-[pkgsrcCon](//pkgsrc.org/pkgsrcCon/2018/) is the annual technical
-conference for people working on pkgsrc, a framework for building
-over 19,000 open source software packages. pkgsrc is the native
-package manager on NetBSD, SmartOS and Minix, and is portable across
-many different operating systems including Linux and Mac OS X.
-
-
-### `Jun 2018` - BSDCan 2018, Ottawa, Canada
-
-*June 6 - 9, 2018, University of Ottawa, Ottawa, Canada*
-
-[BSDCan](https://www.bsdcan.org/2018/), a BSD conference held in
-Ottawa, Canada, quickly established itself as the technical conference
-for people working on and with 4.4BSD based operating systems and
-related projects. The organizers have found a fantastic formula
-that appeals to a wide range of people from extreme novices to
-advanced developers.
-
-
-### `Mar 2018` - AsiaBSDCon 2018, Tokyo, Japan
-
-*March 8 - 11, Tokyo University of Science, Tokyo, Japan*

(Diff truncated)
remove hideously out of date lists
--- wikisrc/features/audio-hardware.mdwn	2021-03-26 09:47:56.331496528 +0000
+++ /dev/null	2021-03-26 09:47:05.332802135 +0000
@@ -1,22 +0,0 @@
-#Supported Audio hardware
-
-Audio devices are supported by the audio(4) and mixer(4) drivers.
-
-<table>
-<tr>
- <th>Release</th>
- <th>Platform</th>
- <th>Audio hardware</th>
-</tr>
-<tr>
- <td>3+</td>
- <td>i386/amd64</td>
- <td>Intel 82801GB/GR (azalia) + Realtek ALC882 codec</td>
-</tr>
-<tr>
- <td>3+</td>
- <td>amiga</td>
- <td>native chipset</td>
-</tr>
-</table>
-
--- wikisrc/features/video-hardware.mdwn	2021-03-26 09:47:56.369818631 +0000
+++ /dev/null	2021-03-26 09:47:05.332802135 +0000
@@ -1,39 +0,0 @@
-#Supported video hardware
-
-<table>
-<tr>
- <th>Release</th>
- <th>Platform</th>
- <th>Video hardware</th>
- <th>text console</th>
- <th>graphics</th>
-</tr>
-<tr>
- <td>2+</td>
- <td>i386/amd64</td>
- <td>NVidia GeForce2 Go</td>
- <td>wscons</td>
- <td>base Xorg, pkgsrc modular-xorg-server</td>
-</tr>
-<tr>
- <td>5+</td>
- <td>i386/amd64</td>
- <td>ATI Mobility Radeon HD 3650</td>
- <td>wscons</td>
- <td>base Xorg</td>
-</tr>
-<tr>
- <td>5+</td>
- <td>amiga</td>
- <td>native chipset</td>
- <td>grfcc, wscons</td>
- <td>base Xorg</td>
-</tr>
-<tr>
- <td>7</td>
- <td>evbarm RPI</td>
- <td>native chipset</td>
- <td>wscons</td>
- <td>base Xorg</td>
-</tr>
-</table>

project abandoned
Index: wikisrc/projects/project/xray.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/xray.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/xray.mdwn	3 Feb 2019 21:13:09 -0000	1.1
+++ wikisrc/projects/project/xray.mdwn	26 Mar 2021 09:24:53 -0000	1.2
@@ -6,9 +6,7 @@
 [tech-kern](mailto:tech-kern@NetBSD.org)
 """
 
-mentors="""
-[Kamil Rytarowski](mailto:kamil@NetBSD.org)
-"""
+done_by="kamil"
 
 category="analyzers"
 difficulty="hard"
@@ -16,6 +14,11 @@
 
 description="""
 
+***Note:** This project has been abandoned. XRay as DTrace is currently
+viewed to be unsuitable for NetBSD because it requires RWX kernel mappings,
+and the workaround for this is expected to be very slow and introduce
+unacceptable bloat to the kernel.
+
 XRay is a function call tracing system which combines compiler-inserted
 instrumentation points and a runtime library that can dynamically enable
 and disable the instrumentation.
@@ -36,5 +39,3 @@
 
 """
 ]]
-
-[[!tag gsoc]]

zfs: clarify rm/zil-commit issue
Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- wikisrc/zfs.mdwn	20 Mar 2021 20:14:29 -0000	1.41
+++ wikisrc/zfs.mdwn	25 Mar 2021 22:59:39 -0000	1.42
@@ -8,6 +8,10 @@
 Many things are marked with \todo because they need a better
 explanation, and some have question marks
 
+This HOWTO describes the most recent state of branches, and does not
+attempt to describe formal releases.  This is a clue; if you are using
+NetBSD 9 and ZFS, you should update along the branch.
+
 # Status of ZFS in NetBSD
 
 ## NetBSD 8
@@ -22,23 +26,25 @@
 NetBSD-9 has ZFS that is considered to work well.  There have been
 fixes since 9.0_RELEASE.  As always, people running NetBSD 9 are
 likely best served by the most recent version of the netbsd-9 stable
-branch.  As of 2021-02, ZFS in the NetBSD 9.1 release is very close to
-netbsd-9.
+branch.  As of 2021-03, ZFS in the NetBSD 9.1 release is very close to
+netbsd-9, except that the mkdir fix is newly in netbsd-9.
 
-There is a crash with mkdir over NFS with maproot.   See http://gnats.netbsd.org/55042
+There was a crash with mkdir over NFS with maproot, resolved in March
+2021 in 9 and current.  See http://gnats.netbsd.org/55042
 
-There is a credible rumor, but apparently no PR, that rm spuriously
-commits the ZIL, which hurts performance.
+There is a workaround where removing a file will commit the ZIL
+(normally this would not be done), to avoid crashes due to vnode
+reclaims.  \todo Link to PR.
 
 There has been a report of an occasional panic somewhere in
 zfs_putpages.
 
 ## NetBSD-current
 
-NetBSD-current (as of 2021-02) has similar ZFS code to 9.
+NetBSD-current (as of 2021-03) has similar ZFS code to 9.
 
-There is initial support for [[ZFS root|wiki/RootOnZFS]], via booting from
-ffs and pivoting.
+There is initial support for [[ZFS root|wiki/RootOnZFS]], via booting
+from ffs and pivoting.
 
 ## NetBSD/xen special issues
 

Add a bounty for xhci scatter-gather
--- /dev/null	2021-03-25 20:17:06.447727340 +0000
+++ wikisrc/projects/project/xhci_sg.mdwn	2021-03-25 20:17:25.135025742 +0000
@@ -0,0 +1,20 @@
+[[!template id=project
+
+title="xhci scatter-gather support"
+
+contact="""
+[tech-kern](mailto:tech-kern@NetBSD.org)
+"""
+
+category="kernel"
+difficulty="hard"
+funded="coypu@sdf.org ($400 expires 1/July/2021)"
+description="""
+
+The current xhci driver requires contiguous allocations, and with higher uptime, NetBSD's kernel memory becomes more and more fragmented.  
+Eventually, large contiguous allocations aren't possible, resulting in random USB driver failures.  
+This feature will improve user experience of NetBSD.
+
+"""
+
+]]

unlist funding
suggested by riastradh
Members: 
	projects/project/virtual_network_stacks.mdwn:1.1->1.2 

Index: wikisrc/projects/project/virtual_network_stacks.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/virtual_network_stacks.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/virtual_network_stacks.mdwn	10 Nov 2011 03:06:51 -0000	1.1
+++ wikisrc/projects/project/virtual_network_stacks.mdwn	25 Mar 2021 20:07:21 -0000	1.2
@@ -11,7 +11,6 @@
 
 category="networking"
 difficulty="hard"
-funded="The NetBSD Foundation"
 
 description="""
 This project proposal is a subtask of [[smp_networking]] and is elegible

style
Index: wikisrc/projects/project/xhci_resume.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/xhci_resume.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/xhci_resume.mdwn	25 Mar 2021 19:58:36 -0000	1.1
+++ wikisrc/projects/project/xhci_resume.mdwn	25 Mar 2021 20:02:16 -0000	1.2
@@ -11,8 +11,8 @@
 funded="coypu@sdf.org ($200 expires 1/July/2021)"
 description="""
 
-Currently, devices connected via xhci do not work after resume.
-In some cases, this is the only thing missing for a flawless resume experience.
+Currently, devices connected via xhci do not work after resume.  
+In some cases, this is the only thing missing for a flawless resume experience.  
 Since xhci is widespread, this will greatly improve laptop user experience.
 
 """

Attempt to use project template to offer bounties. xhci suspend/resume.
--- /dev/null	2021-03-25 19:59:05.264044898 +0000
+++ wikisrc/projects/project/xhci_resume.mdwn	2021-03-25 19:59:13.625274603 +0000
@@ -0,0 +1,20 @@
+[[!template id=project
+
+title="xhci resume support"
+
+contact="""
+[tech-kern](mailto:tech-kern@NetBSD.org)
+"""
+
+category="kernel"
+difficulty="medium"
+funded="coypu@sdf.org ($200 expires 1/July/2021)"
+description="""
+
+Currently, devices connected via xhci do not work after resume.
+In some cases, this is the only thing missing for a flawless resume experience.
+Since xhci is widespread, this will greatly improve laptop user experience.
+
+"""
+
+]]

ZFS NFS bug is fixed
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- wikisrc/releng/netbsd-10.mdwn	25 Mar 2021 12:38:34 -0000	1.39
+++ wikisrc/releng/netbsd-10.mdwn	25 Mar 2021 12:46:31 -0000	1.40
@@ -30,7 +30,7 @@
 * [[!template id=pr number=54761]]: nvme corruption on GENERIC without DIAGNOSTIC
 * ~~[[!template id=pr number=54771]]: nvme(4) fails to attach~~ (not a showstopper)
 * [[!template id=pr number=54914]]: fcntl(F_GETPATH) is broken in chroot
-* [[!template id=pr number=55042]]: kernel panics when ZFS filesystem is exported with NFS
+* ~~[[!template id=pr number=55042]]: kernel panics when ZFS filesystem is exported with NFS~~
 * ~~[[!template id=pr number=55458]]: entropy: WrAnRdNcING no nstropy in  eed~~
 * [[!template id=pr number=55510]]: pg_jobc going negative and crashing the kernel
 * [[!template id=pr number=55533]]: mmap(2) fails when called with a non-zero hint

updates and additions
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wikisrc/releng/netbsd-10.mdwn	1 Mar 2021 19:57:46 -0000	1.38
+++ wikisrc/releng/netbsd-10.mdwn	25 Mar 2021 12:38:34 -0000	1.39
@@ -14,7 +14,8 @@
 * ~~[[!template id=pr number=55489]]: Infinite loop in "rump ifconfig bridge0 create"~~
 * ~~[[!template id=pr number=55509]]: npm install -g electron crashes the kernel~~
 * ~~[[!template id=pr number=55567]]: tcp-send slows down to slow single byte transfers~~
-* [[!template id=pr number=55997]]: lang/perl5 fails to build on NetBSD-current under COMPAT_NETBSD32
+* ~~[[!template id=pr number=55997]]: lang/perl5 fails to build on NetBSD-current under COMPAT_NETBSD32~~ (perl bug?)
+* [[!template id=pr number=56073]]: reading from /dev/pad panics the kernel with an assertion failure
 
 ## PRs worth fixing
 
@@ -45,6 +46,25 @@
 * [[!template id=pr number=55338]]: rump threxec test broken
 * [[!template id=pr number=55632]]: tests/net/ipsec/t_ipsec_misc: timeout tests fail randomly
 
+## Ongoing projects and unmerged branches
+
+* [Wifi renewal on hg](../Wifi_renewal_on_hg)
+* [Updating drmkms to Linux 5.6](https://github.com/riastradh/netbsd-src/tree/redrm56)
+* [Removing PF](http://mail-index.netbsd.org/tech-kern/2019/04/04/msg024986.html)
+	- pf was deprecated in 9 so it could be removed in 10.
+	- what is left to do to improve npf?
+		- ftp-proxy(8) does not support npf but does support ipf and pf
+		- altq(4)
+		- shared rulesets ("ipf groups")?
+		- address subset selection?
+		- update NetBSD Guide from ipf and document migrations
+		- note that most of the above are ipf things, not pf things.
+		- ...
+* [Waiting for Randot](http://mail-index.netbsd.org/tech-security/2021/01/11/msg001100.html)
+	- we probably need to decide on how randomness would work before branch.
+	- Riastradh proposed getrandom(p,n,0) should not block. this needs to be done still.
+	- getentropy is missing from NetBSD but will be in POSIX.
+
 ## Current status and timeline
 
 * no concrete timeline yet, to be re-evaluated mid-March

zfs: Add 9 woes
Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- wikisrc/zfs.mdwn	18 Feb 2021 00:28:44 -0000	1.40
+++ wikisrc/zfs.mdwn	20 Mar 2021 20:14:29 -0000	1.41
@@ -25,6 +25,14 @@
 branch.  As of 2021-02, ZFS in the NetBSD 9.1 release is very close to
 netbsd-9.
 
+There is a crash with mkdir over NFS with maproot.   See http://gnats.netbsd.org/55042
+
+There is a credible rumor, but apparently no PR, that rm spuriously
+commits the ZIL, which hurts performance.
+
+There has been a report of an occasional panic somewhere in
+zfs_putpages.
+
 ## NetBSD-current
 
 NetBSD-current (as of 2021-02) has similar ZFS code to 9.

xen howo: rototill some more
redo virtualization types
Separate provider-specific pvgrub info into sections. Declare that
only providers that actually support NetBSD are listed.
general editing; no really significant changes.
Separate provider-specific pvgrub info into sections.  Declare that
only providers that actually support NetBSD are listed.

general editing; no really significant changes.

Members: 
	ports/xen/howto.mdwn:1.204->1.205 

Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- wikisrc/ports/xen/howto.mdwn	15 Mar 2021 00:25:54 -0000	1.204
+++ wikisrc/ports/xen/howto.mdwn	15 Mar 2021 23:01:56 -0000	1.205
@@ -40,42 +40,50 @@
 
 ## Guest Styles
 
-Xen supports different styles of guests.
+Xen supports different styles of guests.  See
+https://wiki.xenproject.org/wiki/Virtualization_Spectrum for a
+discussion.
+
+This table shows the styles, and if a NetBSD dom0 can run in that
+style, if a NetBSD dom0 can sypport that style of guest in a domU, and
+if NetBSD as a domU can support that style.
 
 [[!table data="""
-Style of guest	|description				|NetBSD dom0?	|NetBSD domU?
-PV		|Paravirtualization (hypercalls)   	|yes		|yes
-HVM		|unmodified guest - domU perceives HW	|can run guests	|yes
-PVHVM		|Like HVM but also PV drivers		|can run guests	|current only
-PVH		|Lightweight HVM (no qemu) and PV	|not yet	|current only
+Style of guest	|dom0 can be?	|dom0 can support?	|domU can be?
+PV		|yes		|yes			|yes
+HVM		|N/A		|yes			|yes
+PVHVM		|N/A		|yes			|current only
+PVH		|not yet	|current only		|current only
 """]]
 
-In Para-Virtualized (PV) mode, the guest OS does not attempt to access
+In PV (paravirtualized) mode, the guest OS does not attempt to access
 hardware directly, but instead makes hypercalls to the hypervisor; PV
-guests must be specifically coded for Xen.
-See [PV](https://wiki.xen.org/wiki/Paravirtualization_(PV\)).
+guests must be specifically coded for Xen.  See
+[PV](https://wiki.xen.org/wiki/Paravirtualization_(PV\)).
 
-In HVM mode, no guest modification is required; however, hardware
-support is required, such as VT-x on Intel CPUs and SVM on AMD CPUs.
-The dom0 runs qemu to emulate hardware.  It is therefore non-sensical
-to have an HVM dom0.
+In HVM (Hardware Virtual Machine) mode, no guest modification is
+required.  However, hardware support is required, such as VT-x on
+Intel CPUs and SVM on AMD CPUs to assist with the processor emulation.
+The dom0 runs qemu to emulate hardware other than the processor.  It
+is therefore non-sensical to have an HVM dom0, because there is no
+underlying system to provide emulation.
 
-In PVHVM mode, the guest runs as HVM, but additionally can use PV
+In PVHVM mode, the guest runs as HVM, but additionally uses PV
 drivers for efficiency.  Therefore it is non-sensical for to have a
 PVHVM dom0.  See [PV on HVM](https://wiki.xen.org/wiki/PV_on_HVM).
 
 There have been two PVH modes: original PVH and PVHv2.  Original PVH
 was based on PV mode and is no longer relevant at all.  Therefore
-PVHv2 is abreviated PVH.  PVHv2 is basically lightweight HVM with PV
-drivers.  A critical feature of it is that qemu is not needed; the
-hypervisor can do the emulation that is required.  Thus, a dom0 can be
-PVHv2.  The source code uses PVH and config files use pvh, but NB that
-this refers to PVHv2.  See
+PVHv2 is written as PVH, here and elsewhere.  PVH is basically
+lightweight HVM with PV drivers.  A critical feature of it is that
+qemu is not needed; the hypervisor can do the emulation that is
+required.  Thus, a dom0 can be PVH.  The source code uses PVH and
+config files use pvh, but NB that this refers to PVHv2.  See
 [PVH(v2)](https://wiki.xenproject.org/wiki/PVH_(v2\)_Domu).
 
-At system boot, the dom0 kernel is loaded as a module with Xen as the kernel.
-The dom0 can start one or more domUs.  (Booting is explained in detail
-in the dom0 section.)
+At system boot, the dom0 kernel is loaded as a module with Xen as the
+kernel.  The dom0 can start one or more domUs.  (Booting is explained
+in detail in the dom0 section.)
 
 ## CPU Architecture
 
@@ -116,7 +124,7 @@
 
 NetBSD Xen has always supported PV, in both dom0 and domU; for a long
 time this was the only way.  NetBSD >=8 as a dom0 supports HVM mode in
-domUs (HVM as a dom0 does not make sense).
+domUs.
 
 Support for PVHVM and PVH is available only in NetBSD-current; this is
 currently somewhat experimental, although PVHVM appears reasonably
@@ -154,15 +162,16 @@
 using Xen.  Therefore, use the most recent release, or a build from
 the most recent stable branch.  Alternatively, use -current, being
 mindful of all the usual caveats of lower stability of current, and
-likely a bit more so.
+likely a bit more so.  Think about how you will provide storage for
+disk images.
 
 ## Installation of Xen
 
 ### Building Xen
 
-Use the most recent version of Xen in pkgsrc, unless the DESCR says that it is not suitable.
-Therefore, choose 4.13.
-In the dom0, install xenkernel413 and xentools413 from pkgsrc.
+Use the most recent version of Xen in pkgsrc, unless the DESCR says
+that it is not suitable.  Therefore, choose 4.13.  In the dom0,
+install xenkernel413 and xentools413 from pkgsrc.
 
 Once this is done, copy the Xen kernel from where pkgsrc puts it to
 where the boot process will be able to find it:
@@ -208,7 +217,7 @@
 
 Beware that userconf statements must be attached to the dom0 load, and
 may not be at top-level, because then they would try to configure the
-hypervisor, if there is a way to pass them via multiboot .  It appears
+hypervisor, if there is a way to pass them via multiboot.  It appears
 that adding `userconf=pckbc` to `/boot.cfg` causes Xen to crash very
 early with a heap overflow.
 
@@ -264,12 +273,14 @@
 
 ### Tuning
 
-In an attempt to add performance, one can also add `dom0_max_vcpus=1 dom0_vcpus_pin`,
-to force only one vcpu to be provided (since NetBSD dom0 can't use
-more) and to pin that vcpu to a physical CPU. Xen has
-[many boot options](http://xenbits.xenproject.org/docs/4.13-testing/misc/xen-command-line.html),
+In an attempt to add performance, one can also add `dom0_max_vcpus=1
+dom0_vcpus_pin`, to force only one vcpu to be provided (since NetBSD
+dom0 can't use more) and to pin that vcpu to a physical CPU. Xen has
+[many boot
+options](http://xenbits.xenproject.org/docs/4.13-testing/misc/xen-command-line.html),
 and other than dom0 memory and max_vcpus, they are generally not
 necessary.
+
 \todo Revisit this advice with current.
 \todo Explain if anyone has ever actually measured that this helps.
 
@@ -328,15 +339,18 @@
 
 One is that through NetBSD 9 the module ABI is different because some
 of the #defines change, so there are separate sets of modules in
-/stand.  In NetBSD-current, there is only one set of modules.
+/stand.  (Further, zfs in Xen is troubled because of differing
+MAXPHYS; see the zfs howto for more.)  In NetBSD-current, there is
+only one set of modules.
 
 The other difference is that XEN3_DOM0 does not have exactly the same
-options as GENERIC.  While it is debatable whether or not this is a
-bug, users should be aware of this and can simply add missing config
+options as GENERIC.  While this is roughly agreed to be in large part
+a bug, users should be aware of this and can simply add missing config
 items if desired.
 
 Finally, there have been occasional reports of trouble with X11
-servers in NetBSD as a dom0.
+servers in NetBSD as a dom0.  Some hardware support is intentionally
+disabled in XEN3_DOM0.
 
 ## Updating Xen in a dom0
 
@@ -357,9 +371,9 @@
 
 ## anita (for testing NetBSD)
 
-With a NetBSD dom0, even without any domUs, one should be able to run
-anita (see pkgsrc/misc/py-anita) to test NetBSD releases, by doing (as
-root, because anita must create a domU):
+With a NetBSD dom0, even without any domUs, one can run anita (see
+pkgsrc/misc/py-anita) to test NetBSD releases, by doing (as root,
+because anita must create a domU):
 
 [[!template id=programlisting text="""
 anita --vmm=xl test file:///usr/obj/i386/
@@ -385,8 +399,8 @@
 See /usr/pkg/share/examples/xen/xlexample* for a very small number of
 examples for running GNU/Linux.
 
-The following is an example minimal domain configuration file. The domU
-serves as a network file server.
+The following is an example minimal domain configuration file.  The
+domU serves as a network file server.
 
 [[!template id=filecontent name="/usr/pkg/etc/xen/foo" text="""
 name = "domU-id"
@@ -406,9 +420,9 @@
 dom0 on domain creation.  The system treats xbd0 as the boot device
 without needing explicit configuration.
 
-There is not type line; that implicitly defines a pv domU.  Otherwise,
-one sets type to the lower-case version of the domU type in the table

(Diff truncated)
adjust pv/hvm wording
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- wikisrc/ports/xen/howto.mdwn	15 Mar 2021 00:11:52 -0000	1.203
+++ wikisrc/ports/xen/howto.mdwn	15 Mar 2021 00:25:54 -0000	1.204
@@ -27,7 +27,7 @@
 
 The basic concept of Xen is that the hypervisor (xenkernel) runs on
 the hardware, and runs a privileged domain ("dom0") that can access
-disks/networking/etc.  One then runs additonal unprivileged domains
+disks/networking/etc.  One then runs additional unprivileged domains
 (each a "domU"), presumably to do something useful.
 
 This HOWTO addresses how to run a NetBSD dom0 (and hence also build
@@ -45,9 +45,9 @@
 [[!table data="""
 Style of guest	|description				|NetBSD dom0?	|NetBSD domU?
 PV		|Paravirtualization (hypercalls)   	|yes		|yes
-HVM		|unmodified guest - domU perceives HW	|N/A		|yes
-PVHVM		|Like HVM but also PV drivers		|N/A		|current only
-PVH		|					|not yet	|current only
+HVM		|unmodified guest - domU perceives HW	|can run guests	|yes
+PVHVM		|Like HVM but also PV drivers		|can run guests	|current only
+PVH		|Lightweight HVM (no qemu) and PV	|not yet	|current only
 """]]
 
 In Para-Virtualized (PV) mode, the guest OS does not attempt to access
@@ -85,8 +85,9 @@
 
 The dom0 system should be amd64.  (Instructions for i386PAE dom0 have been removed from the HOWTO.)
 
-The domU can be i386PAE or amd64.
-i386PAE at one point was considered as [faster](https://lists.xen.org/archives/html/xen-devel/2012-07/msg00085.html) than amd64.
+The domU can be i386 PAE or amd64.
+i386 PAE at one point was considered as [faster](https://lists.xen.org/archives/html/xen-devel/2012-07/msg00085.html) than amd64.
+However, as of 2021 it is normal to use amd64 as the domU architecture, and use of i386 is dwindling.
 
 ## Xen Versions
 
@@ -105,17 +106,17 @@
 
 See also the [Xen Security Advisory page](http://xenbits.xen.org/xsa/).
 
-Older Xen had a python-based management tool called xm, now replaced
-by xl.
+Older Xen had a python-based management tool called xm; this has been
+replaced by xl.
 
 ## NetBSD versions
 
 Xen has been supported in NetBSD for a long time, at least since 2005.
 Initially Xen was PV only.
 
-NetBSD has supported PV for a very long time, in both dom0 and domU.
-NetBSD >=8 supports HVM mode as a domU (HVM as a dom0 does not make
-sense).
+NetBSD Xen has always supported PV, in both dom0 and domU; for a long
+time this was the only way.  NetBSD >=8 as a dom0 supports HVM mode in
+domUs (HVM as a dom0 does not make sense).
 
 Support for PVHVM and PVH is available only in NetBSD-current; this is
 currently somewhat experimental, although PVHVM appears reasonably

xen: rototill SMP and PV/HVM/etc. sections
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- wikisrc/ports/xen/howto.mdwn	9 Mar 2021 13:57:53 -0000	1.202
+++ wikisrc/ports/xen/howto.mdwn	15 Mar 2021 00:11:52 -0000	1.203
@@ -1,4 +1,4 @@
-[[!meta title="Xen HowTo and Status"]]
+[[!meta title="Xen Status and HowTo"]]
 
 Xen is a Type 1 hypervisor which supports running multiple guest operating
 systems on a single physical machine. One uses the Xen kernel to control the
@@ -8,15 +8,19 @@
 from the domU systems are forwarded by the Xen hypervisor to the dom0 to be
 fulfilled.
 
-This HOWTO presumes a basic familiarity with the Xen system
-architecture, with installing NetBSD on amd64 hardware, and with
-installing software from pkgsrc.  See also the [Xen
-website](http://www.xenproject.org/).
-
-This document also provides status on what Xen things work on NetBSD
+This document provides status on what Xen things work on NetBSD
 (upstream documentation might say something works if it works on some
 particular Linux system).
 
+This document is also a HOWTO that presumes a basic familiarity with
+the Xen system architecture, with installing NetBSD on amd64 hardware,
+and with installing software from pkgsrc.  See also the [Xen
+website](http://www.xenproject.org/).
+
+If this document says that something works, and you find that it does
+not, it is best to ask on port-xen and if you are correct to file a
+PR.
+
 [[!toc]]
 
 # Overview
@@ -39,11 +43,11 @@
 Xen supports different styles of guests.
 
 [[!table data="""
-Style of guest	|Supported by NetBSD
-PV		|Yes (dom0, domU)
-HVM		|Yes (domU)
-PVHVM		|current-only (domU)
-PVH		|current-only (domU, dom0 not yet)
+Style of guest	|description				|NetBSD dom0?	|NetBSD domU?
+PV		|Paravirtualization (hypercalls)   	|yes		|yes
+HVM		|unmodified guest - domU perceives HW	|N/A		|yes
+PVHVM		|Like HVM but also PV drivers		|N/A		|current only
+PVH		|					|not yet	|current only
 """]]
 
 In Para-Virtualized (PV) mode, the guest OS does not attempt to access
@@ -61,12 +65,13 @@
 PVHVM dom0.  See [PV on HVM](https://wiki.xen.org/wiki/PV_on_HVM).
 
 There have been two PVH modes: original PVH and PVHv2.  Original PVH
-was based on PV mode and is no longer relevant at all.  PVHv2 is
-basically lightweight HVM with PV drivers.  A critical feature of it
-is that qemu is not needed; the hypervisor can do the emulation that
-is required.  Thus, a dom0 can be PVHv2.
-The source code uses PVH and config files use pvh; this refers to PVHv2.
-See [PVH(v2)](https://wiki.xenproject.org/wiki/PVH_(v2\)_Domu).
+was based on PV mode and is no longer relevant at all.  Therefore
+PVHv2 is abreviated PVH.  PVHv2 is basically lightweight HVM with PV
+drivers.  A critical feature of it is that qemu is not needed; the
+hypervisor can do the emulation that is required.  Thus, a dom0 can be
+PVHv2.  The source code uses PVH and config files use pvh, but NB that
+this refers to PVHv2.  See
+[PVH(v2)](https://wiki.xenproject.org/wiki/PVH_(v2\)_Domu).
 
 At system boot, the dom0 kernel is loaded as a module with Xen as the kernel.
 The dom0 can start one or more domUs.  (Booting is explained in detail
@@ -108,15 +113,25 @@
 Xen has been supported in NetBSD for a long time, at least since 2005.
 Initially Xen was PV only.
 
-NetBSD 8 and up support PV and HVM modes.
-
-Support for PVHVM and PVH is available only in NetBSD-current.
-
-NetBSD up to and including NetBSD 9 as a dom0 does not run SMP,
-because some drivers are not yet safe for this.  NetBSD-current
-supports SMP in dom0.
-
-NetBSD, when run as a domU, can and does typically run SMP.
+NetBSD has supported PV for a very long time, in both dom0 and domU.
+NetBSD >=8 supports HVM mode as a domU (HVM as a dom0 does not make
+sense).
+
+Support for PVHVM and PVH is available only in NetBSD-current; this is
+currently somewhat experimental, although PVHVM appears reasonably
+solid.
+
+NetBSD up to and including NetBSD 9 as a dom0 cannot safely run SMP.
+Even if one added "options MULTIPROCESSOR" and configured multiple
+vcpus, the kernel is likely to crash because of drivers without
+adequate locking.
+
+NetBSD-current supports SMP in dom0, and XEN3_DOM0 includes "options
+MULTIPROCESSOR".
+
+NetBSD (since NetBSD 6), when run as a domU, can run SMP, using
+multiple CPUs if provided.  The XEN3_DOMU kernel is built
+with "options MULITPROCESSOR".
 
 Note that while Xen 4.13 is current, the kernel support is still
 called XEN3, because the hypercall interface has not changed

benchmark project is done
Index: wikisrc/projects/project/benchmark.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/benchmark.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/projects/project/benchmark.mdwn	13 Feb 2018 13:26:02 -0000	1.3
+++ wikisrc/projects/project/benchmark.mdwn	12 Mar 2021 11:01:32 -0000	1.4
@@ -14,6 +14,8 @@
 difficulty="easy"
 duration="3 months"
 
+done_by="Apurva Nandan"
+
 description="""
 
 Find and execute benchmarks of various kernel features and userland

couldn't find a mentor for debpkg
posix_spawn project was done by nikita last gsoc
Members: 
	projects/project/debpkg.mdwn:1.6->1.7 
	projects/project/make_system__40__3__41___and_popen__40__3__41___use_posix__95__spawn__40__3__41__.mdwn:1.1->1.2 

Index: wikisrc/projects/project/debpkg.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/debpkg.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/projects/project/debpkg.mdwn	22 Feb 2019 12:36:43 -0000	1.6
+++ wikisrc/projects/project/debpkg.mdwn	12 Mar 2021 10:56:10 -0000	1.7
@@ -30,5 +30,3 @@
 
 """
 ]]
-
-[[!tag gsoc]]
Index: wikisrc/projects/project/make_system__40__3__41___and_popen__40__3__41___use_posix__95__spawn__40__3__41__.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/make_system__40__3__41___and_popen__40__3__41___use_posix__95__spawn__40__3__41__.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/make_system__40__3__41___and_popen__40__3__41___use_posix__95__spawn__40__3__41__.mdwn	24 Jan 2019 18:46:19 -0000	1.1
+++ wikisrc/projects/project/make_system__40__3__41___and_popen__40__3__41___use_posix__95__spawn__40__3__41__.mdwn	12 Mar 2021 10:56:10 -0000	1.2
@@ -10,6 +10,8 @@
 [Martin Husemann](mailto:martin@NetBSD.org)
 """
 
+done_by="Nikita"
+
 category="userland"
 difficulty="easy"
 

Mark some projects done (no longer available for GSoC)
Index: wikisrc/projects/project/libcurses-automated-test.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/libcurses-automated-test.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/projects/project/libcurses-automated-test.mdwn	7 Apr 2019 15:25:25 -0000	1.4
+++ wikisrc/projects/project/libcurses-automated-test.mdwn	11 Mar 2021 08:52:52 -0000	1.5
@@ -10,11 +10,18 @@
 [Brett Lymn](mailto:blymn@NetBSD.org)
 """
 
+done_by="Naman Jain"
+
 category="userland"
 difficulty="easy"
 duration="3 months"
 
 description="""
+
+***Update***: This project was completed by Naman Jain during Google Summer
+of Code 2020 and merged into NetBSD. More tests are still needed for
+completion's sake.
+
 The curses library is an important part of the NetBSD operating system, many applications rely on the correct functioning of the library. Performing modifications on the curses library can be difficult because the effects of the change may be subtle and can introduce bugs that are not detected for a long time.
 
 The testing framework has been written to run under the atf framework but has not been committed to the tree yet.
Index: wikisrc/projects/project/pkgsrc_gnome_support.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/pkgsrc_gnome_support.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/projects/project/pkgsrc_gnome_support.mdwn	27 Jan 2018 18:31:21 -0000	1.3
+++ wikisrc/projects/project/pkgsrc_gnome_support.mdwn	11 Mar 2021 08:52:52 -0000	1.4
@@ -9,17 +9,17 @@
 mentors="""
 [Thomas Klausner](mailto:wiz@NetBSD.org)
 """
+done_by="Dan Cîrnaț, Nia Alarie"
 
 category="pkgsrc"
 difficulty="hard"
 duration="6 months"
 
 description="""
-Improve support for NetBSD in various GNOME packages.
 
-The easy targets are adding more support for NetBSD to various system and network monitoring infrastructure (which support some stuff already).
-
-A harder step is to port the devicekit and libudev parts of GNOME.
+***Update***: GNOME Shell now runs on NetBSD as the result of work by Dan
+Cîrnaț, Nia Alarie, and others. However, there's always more work to be done
+maintaining it and porting more components.
 
 """
 ]]
Index: wikisrc/projects/project/scalable-entropy.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/scalable-entropy.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/scalable-entropy.mdwn	9 Sep 2020 13:32:12 -0000	1.2
+++ wikisrc/projects/project/scalable-entropy.mdwn	11 Mar 2021 08:52:52 -0000	1.3
@@ -9,12 +9,16 @@
 mentors="""
 [Taylor R Campbell](mailto:riastradh@NetBSD.org)
 """
+done_by="Taylor R Campbell"
 
 category="kernel"
 difficulty="medium"
 duration="2-3 months"
 
 description="""
+
+***Update***: This project was completed in 2020 by Riastradh.
+
 The kernel entropy pool provides unpredictable secrets via the
  [[!template id=man name="rnd" section="4"]] (/dev/urandom)
  device for applications doing cryptography, Monte Carlo simulations,

Date Fix:May.29 2021: Open Source Conference 2021 Online/Nagoya NetBSD BoF
Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- wikisrc/users/jun.mdwn	9 Mar 2021 04:20:21 -0000	1.46
+++ wikisrc/users/jun.mdwn	11 Mar 2021 01:59:13 -0000	1.47
@@ -5,7 +5,8 @@
 # 2021
 ## Open Source Conference 2021 Online/Nagoya NetBSD BoF
 - 2021 May.29 Sat XX:XX-XX:XX JST (UTC+9) TBD
-- Join meeting with ZOOM/YoutubeLive 
+- [[https://event.ospn.jp/osc2021-online-nagoya]]
+- Join meeting with ZOOM/YoutubeLive [[https://ospn.connpass.com/event/204981/]]
 - YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
 
 ## Open Source Conference 2021 Online/Hokkaido NetBSD BoF

There is no boot.cfg keyword "losad". Presumably "load" was intended.
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- wikisrc/ports/xen/howto.mdwn	7 Mar 2021 20:27:26 -0000	1.201
+++ wikisrc/ports/xen/howto.mdwn	9 Mar 2021 13:57:53 -0000	1.202
@@ -222,7 +222,7 @@
 
 The hypervisor can be configured to use a serial port console, e.g.
 [[!template id=filecontent name="/boot.cfg" text="""
-menu=Xen:losad /netbsd-XEN3_DOM0.gz console=com0;multiboot /xen.gz dom0_mem=512M console=com1 com1=9600,8n1
+menu=Xen:load /netbsd-XEN3_DOM0.gz console=com0;multiboot /xen.gz dom0_mem=512M console=com1 com1=9600,8n1
 """]]
 This example uses the first serial port (Xen counts from 1; this is
 what NetBSD would call com0), and sets speed and parity.  (The dom0 is

Add youtube archive link: Open Source Conference 2021 Online/Spring NetBSD BoF and move past.
Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- wikisrc/users/jun.mdwn	1 Mar 2021 11:01:56 -0000	1.45
+++ wikisrc/users/jun.mdwn	9 Mar 2021 04:20:21 -0000	1.46
@@ -3,15 +3,6 @@
 [[jun/2020]]
 
 # 2021
-## Open Source Conference 2021 Online/Spring NetBSD BoF
-- 2021 Mar.6 Sat 10:00-10:45 JST (UTC+9) ROOM C
-- https://register.ospn.jp/osc2021-online-spring/modules/eventrsv/2.html
-- Join meeting with ZOOM/YoutubeLive [[https://ospn.connpass.com/event/196661/]]
-- YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
-- 16:00-16:45 Room E Cross BUGLUG Community Camp 
-- [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2021tokyospring.pdf]]
-- [[https://togetter.com/li/1675363]]
-
 ## Open Source Conference 2021 Online/Nagoya NetBSD BoF
 - 2021 May.29 Sat XX:XX-XX:XX JST (UTC+9) TBD
 - Join meeting with ZOOM/YoutubeLive 
@@ -28,6 +19,15 @@
 - YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
 
 # Past Events
+## Open Source Conference 2021 Online/Spring NetBSD BoF
+- 2021 Mar.6 Sat 10:00-10:45 JST (UTC+9) ROOM C
+- https://register.ospn.jp/osc2021-online-spring/modules/eventrsv/2.html
+- Join meeting with ZOOM/YoutubeLive [[https://ospn.connpass.com/event/196661/]]
+- YoutubeLive [[https://www.youtube.com/watch?v=9nvxjqZ13J4]] 
+- 16:00-16:45 Room E Cross BUGLUG Community Camp 
+- [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2021tokyospring.pdf]]
+- [[https://togetter.com/li/1675363]]
+
 ## Open Source Conference 2021 Online/Osaka NetBSD BoF
 - 2021 Jan.30 Sat 10:00-10:45 JST (UTC+9) TBD 
 - [[https://event.ospn.jp/osc2021-online-osaka/session/261876]]

Add Kansai Open Forum 2020 Youtube Live Archive link.
Index: wikisrc/users/jun/2020.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun/2020.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/users/jun/2020.mdwn	2 Jan 2021 09:29:39 -0000	1.1
+++ wikisrc/users/jun/2020.mdwn	8 Mar 2021 00:41:26 -0000	1.2
@@ -19,7 +19,7 @@
 ### Kansai Open Forum 2020 BSD BoF
 - 2020 Nov.7 Sat 15:00-15:50 JST (UTC+9)
 - Join meeting with Jitsi Meet,notify me to get confrence URL.
-- YoutubeLive: [[https://youtu.be/5if2LGKIRvQ]]
+- YoutubeLive: [[https://www.youtube.com/playlist?list=PLvY27Za9ZJma-Z_vsy40_I3hM6Im4lRx0]]
 - [[https://www.k-of.jp/2020/]]
 - [[https://k-of.jp/backend/time_schedule_2]]
 - [[https://k-of.jp/backend/session/1374]]

change howto to howto and status
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- wikisrc/ports/xen/howto.mdwn	7 Mar 2021 01:06:00 -0000	1.200
+++ wikisrc/ports/xen/howto.mdwn	7 Mar 2021 20:27:26 -0000	1.201
@@ -1,4 +1,4 @@
-[[!meta title="Xen HowTo"]]
+[[!meta title="Xen HowTo and Status"]]
 
 Xen is a Type 1 hypervisor which supports running multiple guest operating
 systems on a single physical machine. One uses the Xen kernel to control the
@@ -13,6 +13,10 @@
 installing software from pkgsrc.  See also the [Xen
 website](http://www.xenproject.org/).
 
+This document also provides status on what Xen things work on NetBSD
+(upstream documentation might say something works if it works on some
+particular Linux system).
+
 [[!toc]]
 
 # Overview
@@ -388,7 +392,7 @@
 
 There is not type line; that implicitly defines a pv domU.  Otherwise,
 one sets type to the lower-case version of the domU type in the table
-above, e.g.  `type = "hvm"`.
+above, e.g. `type = "hvm"`.
 
 By convention, domain config files are kept in `/usr/pkg/etc/xen`.  Note
 that "xl create" takes the name of a config file, while other commands

xen: explain type line in config
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- wikisrc/ports/xen/howto.mdwn	7 Mar 2021 00:41:16 -0000	1.199
+++ wikisrc/ports/xen/howto.mdwn	7 Mar 2021 01:06:00 -0000	1.200
@@ -362,9 +362,8 @@
 
 ## Config files
 
-See /usr/pkg/share/examples/xen/xlexample*
-for a small number of well-commented examples, mostly for running
-GNU/Linux.
+See /usr/pkg/share/examples/xen/xlexample* for a very small number of
+examples for running GNU/Linux.
 
 The following is an example minimal domain configuration file. The domU
 serves as a network file server.
@@ -387,7 +386,9 @@
 dom0 on domain creation.  The system treats xbd0 as the boot device
 without needing explicit configuration.
 
-There is not type line; that implicitly defines a pv domU.
+There is not type line; that implicitly defines a pv domU.  Otherwise,
+one sets type to the lower-case version of the domU type in the table
+above, e.g.  `type = "hvm"`.
 
 By convention, domain config files are kept in `/usr/pkg/etc/xen`.  Note
 that "xl create" takes the name of a config file, while other commands

xen: Clarify HVM/PVHVM not making sense for dom0
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- wikisrc/ports/xen/howto.mdwn	5 Mar 2021 21:52:36 -0000	1.198
+++ wikisrc/ports/xen/howto.mdwn	7 Mar 2021 00:41:16 -0000	1.199
@@ -49,11 +49,12 @@
 
 In HVM mode, no guest modification is required; however, hardware
 support is required, such as VT-x on Intel CPUs and SVM on AMD CPUs.
-The dom0 runs qemu to emulate hardware.
+The dom0 runs qemu to emulate hardware.  It is therefore non-sensical
+to have an HVM dom0.
 
 In PVHVM mode, the guest runs as HVM, but additionally can use PV
-drivers for efficiency.
-See [PV on HVM](https://wiki.xen.org/wiki/PV_on_HVM).
+drivers for efficiency.  Therefore it is non-sensical for to have a
+PVHVM dom0.  See [PV on HVM](https://wiki.xen.org/wiki/PV_on_HVM).
 
 There have been two PVH modes: original PVH and PVHv2.  Original PVH
 was based on PV mode and is no longer relevant at all.  PVHv2 is

xen howto: caution about root=
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- wikisrc/ports/xen/howto.mdwn	3 Mar 2021 23:17:59 -0000	1.197
+++ wikisrc/ports/xen/howto.mdwn	5 Mar 2021 21:52:36 -0000	1.198
@@ -160,11 +160,12 @@
 
 ### Configuring booting
 
-Read boot.cfg(8) carefully.  Add lines to /boot.cfg to boot Xen:
+Read boot.cfg(8) carefully.  Add lines to /boot.cfg to boot Xen,
+adjusting for your root filesystem:
 
 [[!template id=filecontent name="/boot.cfg" text="""
-menu=Xen:load /netbsd-XEN3_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=512M
-menu=Xen single user:load /netbsd-XEN3_DOM0.gz console=pc -s;multiboot /xen.gz dom0_mem=512M
+menu=Xen:load /netbsd-XEN3_DOM0.gz root=wd0a console=pc;multiboot /xen.gz dom0_mem=512M
+menu=Xen single user:load /netbsd-XEN3_DOM0.gz root=wd0a console=pc -s;multiboot /xen.gz dom0_mem=512M
 """]]
 
 This specifies that the dom0 should have 512MB of ram, leaving the rest
@@ -179,6 +180,11 @@
 \todo Explain why rndseed is not set with Xen as part of the dom0
 subconfiguration.
 
+Note that you are likely to have to set root= because the boot device
+from /boot is not passed via Xen to the dom0 kernel.  With one disk,
+it will work, but e.g. plugging in USB disk to a machine with root on
+wd0a causes boot to fail.
+
 Beware that userconf statements must be attached to the dom0 load, and
 may not be at top-level, because then they would try to configure the
 hypervisor, if there is a way to pass them via multiboot .  It appears

xen: add todo about balloon
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- wikisrc/ports/xen/howto.mdwn	3 Mar 2021 15:09:26 -0000	1.196
+++ wikisrc/ports/xen/howto.mdwn	3 Mar 2021 23:17:59 -0000	1.197
@@ -412,8 +412,13 @@
 sum of the the memory allocated to the dom0 and all domUs must be less
 than the available memory.
 
-Xen also provides a "balloon" driver, which can be used to let domains
-use more memory temporarily.
+## Balloon driver
+
+Xen provides a `balloon` driver, which can be used to let domains use
+more memory temporarily.
+
+\todo Explain how to set up a aystem to use the balloon scheme in a
+useful manner.
 
 ## Virtual disks
 

xen: update domU HVM/PVH sections
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- wikisrc/ports/xen/howto.mdwn	3 Mar 2021 15:03:13 -0000	1.195
+++ wikisrc/ports/xen/howto.mdwn	3 Mar 2021 15:09:26 -0000	1.196
@@ -572,7 +572,7 @@
 Note that NetBSD by default creates only xbd[0123].  If you need more
 virtual disks in a domU, run e.g. "./MAKEDEV xbd4" in the domU.
 
-## Creating a Linux domU
+## Creating a Linux PV domU
 
 Creating unprivileged Linux domains isn't much different from
 unprivileged NetBSD domains, but there are some details to know.
@@ -617,13 +617,18 @@
 
 ## Creating a NetBSD HVM domU
 
-Use type='hmv', probably.  Use a GENERIC kernel within the disk image.
+Use type='hvm', probably.  Use a GENERIC kernel within the disk image.
 
 ## Creating a NetBSD PVH domU
 
-Use type='pvh'.
+This only works with a current kernel in the domU.
 
-\todo Explain where the kernel comes from.
+Use type='pvh'.  Probably, use a GENERIC kernel within the disk image,
+which in current has PV support.
+
+\todo Verify.
+
+\todo Verify if one can have current PVH domU on a 9 dom0.
 
 ## Creating a Solaris domU
 
@@ -633,7 +638,7 @@
 ## PCI passthrough: Using PCI devices in guest domains
 
 NB: PCI passthrough only works on some Xen versions and as of 2020 it
-is not clear that it works on any version in pkgsrc.  Reports
+is not clear that it works on any version in pkgsrc.  \todo Reports
 confirming or denying this notion should be sent to port-xen@.
 
 The dom0 can give other domains access to selected PCI

xen: Caution against top-level userconf
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- wikisrc/ports/xen/howto.mdwn	3 Mar 2021 14:59:32 -0000	1.194
+++ wikisrc/ports/xen/howto.mdwn	3 Mar 2021 15:03:13 -0000	1.195
@@ -179,6 +179,12 @@
 \todo Explain why rndseed is not set with Xen as part of the dom0
 subconfiguration.
 
+Beware that userconf statements must be attached to the dom0 load, and
+may not be at top-level, because then they would try to configure the
+hypervisor, if there is a way to pass them via multiboot .  It appears
+that adding `userconf=pckbc` to `/boot.cfg` causes Xen to crash very
+early with a heap overflow.
+
 ### Console selection
 
 See boot_console(8).  Understand that you should start from a place of

xen howto: console/boot tweaks
per hints from bouyer@
Members: 
	ports/xen/howto.mdwn:1.193->1.194 

Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- wikisrc/ports/xen/howto.mdwn	3 Mar 2021 14:22:24 -0000	1.193
+++ wikisrc/ports/xen/howto.mdwn	3 Mar 2021 14:59:32 -0000	1.194
@@ -176,6 +176,9 @@
 trouble at some point, and keeping an up-to-date GENERIC for use in
 fixing problems is the standard prudent approach.
 
+\todo Explain why rndseed is not set with Xen as part of the dom0
+subconfiguration.
+
 ### Console selection
 
 See boot_console(8).  Understand that you should start from a place of
@@ -197,20 +200,23 @@
 By default, the hypervisor (Xen itself) will use some sort of vga
 device as the console, much like GENERIC uses by default.  The vga
 console is relinquished at the conclusion of hypervisor boot, before
-the dom0 is started.
-
-\todo Explain if there is any notion of input to the Xen console;
-there is something about 3 CTRL-As in a row.  Perhaps this is about
-the serial console which is not relinquished?
+the dom0 is started.  Xen when using a vga console does not process
+console input.
 
 The hypervisor can be configured to use a serial port console, e.g.
 [[!template id=filecontent name="/boot.cfg" text="""
 menu=Xen:losad /netbsd-XEN3_DOM0.gz console=com0;multiboot /xen.gz dom0_mem=512M console=com1 com1=9600,8n1
 """]]
-This exampulee uses the first serial port (Xen counts from 1; this is
+This example uses the first serial port (Xen counts from 1; this is
 what NetBSD would call com0), and sets speed and parity.  (The dom0 is
 then configured to use the same serial port in this example.)
 
+With the hypervisor configured for a serial console, it can get input,
+and there is a notion of passing this input to the dom0.  \todo
+Explain why, if Xen has a serial console, the dom0 console is
+typically also configured to open that same serial port, instead of
+getting the passthrough input via the xen console.
+
 One also configures the console for the dom0.  While one might expect
 console=pc to be default, following behavior of GENERIC, a hasty read
 of the code suggests there is no default and booting without a

xen: rototill console section
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- wikisrc/ports/xen/howto.mdwn	3 Mar 2021 13:19:06 -0000	1.192
+++ wikisrc/ports/xen/howto.mdwn	3 Mar 2021 14:22:24 -0000	1.193
@@ -167,11 +167,6 @@
 menu=Xen single user:load /netbsd-XEN3_DOM0.gz console=pc -s;multiboot /xen.gz dom0_mem=512M
 """]]
 
-\todo Explain why console=pc is given.  Perhaps there is some notion
-of a separate console instead of xencons.
-
-\todo Check the single user line.
-
 This specifies that the dom0 should have 512MB of ram, leaving the rest
 to be allocated for domUs.
 
@@ -187,26 +182,46 @@
 having console setup correct for booting GENERIC before trying to
 configure Xen.
 
-By default, the hypervisor (Xen itself) will use \todo as the console
-
-By default, the NetBSD dom0 kernel will use xencons(4) (the man page
-does not exist) as console.
-
-To use a serial console for the Xen hypervisor, add settings as follows:
+Generally for GENERIC, one sets the console in bootxx_ffsv1 or
+equivalent, and this is passed on to /boot (where one typically does
+not set the console).  This configuration of bootxx_ffsv1 should also
+be in place for Xen systems, to allow seeing messages from /boot and
+use of a keyboard to select a line from the menu.  And, one should
+have a working boot path to GENERIC for rescue situations.
+
+With GENERIC, the boot options are passed on to /netbsd, but there is
+currently no mechanism to pass these via multiboot to the hypervisor.
+Thus, in addition to configuring the console in the boot blocks, one
+must also configure it for Xen.
+
+By default, the hypervisor (Xen itself) will use some sort of vga
+device as the console, much like GENERIC uses by default.  The vga
+console is relinquished at the conclusion of hypervisor boot, before
+the dom0 is started.
+
+\todo Explain if there is any notion of input to the Xen console;
+there is something about 3 CTRL-As in a row.  Perhaps this is about
+the serial console which is not relinquished?
 
+The hypervisor can be configured to use a serial port console, e.g.
 [[!template id=filecontent name="/boot.cfg" text="""
-menu=Xen:load /netbsd-XEN3_DOM0.gz;multiboot /xen.gz dom0_mem=512M console=com1 com1=9600,8n1
+menu=Xen:losad /netbsd-XEN3_DOM0.gz console=com0;multiboot /xen.gz dom0_mem=512M console=com1 com1=9600,8n1
 """]]
-
-which will use the first serial port for Xen (which counts starting
-from 1, unlike NetBSD which counts starting from 0), forcing
-speed/parity.  Because the NetBSD command line lacks a
-"console=pc" argument, it will use the default "xencons" console device,
-which directs the console I/O through Xen to the same console device Xen
-itself uses (in this case, the serial port).
-
-\todo Explain why boot.cfg shows forcing the dom0 console also,
-separately from the hypervisor console.
+This exampulee uses the first serial port (Xen counts from 1; this is
+what NetBSD would call com0), and sets speed and parity.  (The dom0 is
+then configured to use the same serial port in this example.)
+
+One also configures the console for the dom0.  While one might expect
+console=pc to be default, following behavior of GENERIC, a hasty read
+of the code suggests there is no default and booting without a
+selected console might lead to a panic.  Also, there is merit in
+explicit configuration.  Therefore the standard approach is to place
+console=pc as part of the load statement for the dom0 kernel, or
+alternatively console=com0.
+
+The NetBSD dom0 kernel will attach xencons(4) (the man page does not
+exist), but this is not used as a console.  It is used to obtain the
+messages from the hypervisor's console; run `xl dmesg` to see them.
 
 ### Tuning
 

xen howoto: tweak powerd text
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- wikisrc/ports/xen/howto.mdwn	26 Feb 2021 19:03:20 -0000	1.191
+++ wikisrc/ports/xen/howto.mdwn	3 Mar 2021 13:19:06 -0000	1.192
@@ -527,13 +527,12 @@
 
 Finally, all screens must be commented out from `/etc/wscons.conf`.
 
-It is also desirable to add
-
-        powerd=YES
-
-in rc.conf. This way, the domain will be properly shut down if
-`xl shutdown -R` or `xl shutdown -H` is used on the dom0.
-\todo Check the translation to xl.
+One should also run `powerd` in a domU, but this should not need
+configuring.  With powerd, the domain will run a controlled shutdown
+if `xl shutdown -R` or `xl shutdown -H` is used on the dom0, via
+receiving a synthetic `power button pressed` signal.  In 9 and
+current, `powerd` is run by default under Xen kernels (or if ACPI is
+present), and it can be added to rc.conf if not.
 
 It is not strictly necessary to have a kernel (as /netbsd) in the domU
 file system.  However, various programs (e.g. netstat) will use that

Update status and test stats
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wikisrc/releng/netbsd-10.mdwn	27 Feb 2021 10:06:38 -0000	1.37
+++ wikisrc/releng/netbsd-10.mdwn	1 Mar 2021 19:57:46 -0000	1.38
@@ -47,7 +47,7 @@
 
 ## Current status and timeline
 
-* no concrete timeline yet, to be re-evaluated end of February
+* no concrete timeline yet, to be re-evaluated mid-March
 * current is getting a lot better, but there are still issues that need fixing for the branch
 * hoping to see the best architectures with single digit unexpected failures before the branch
 
@@ -65,40 +65,40 @@
         <td>2020-11-08</td> <td>12 failures</td><td></td><td>PR <a href="//gnats.netbsd.org/55272">55272</a>, PR <a href="//gnats.netbsd.org/55338">55338</a></td>
     </tr> ---->
     <tr>
+        <td><a href="//www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/HEAD/">XEN</a>, i386 and amd64</td>
+        <td>2021-02-27</td> <td>10 failures</td><td> </td><td> </td>
+    </tr>
+    <tr>
         <td><a href="//releng.netbsd.org/b5reports/amd64/">amd64</a>, qemu, official b5 runs</td>
-        <td>2021-02-16</td> <td>22 failures</td><td> </td><td> </td>
+        <td>2021-03-01</td> <td>22 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.NetBSD.org/~martin/aarch64-atf/">evbarm64el-aarch64</a>, real hardware</td>
-        <td>2021-02-11</td> <td>28 failures</td><td> </td><td> </td>
+        <td>2021-02-27</td> <td>26 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/evbearmv7hf-atf/">evbearmv7hfeb</a>, real hardware</td>
-        <td>021-02-09</td> <td>37 failures</td><td> </td><td> </td>
+        <td>2021-03-01</td> <td>28 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//releng.netbsd.org/b5reports/i386/">i386</a>, qemu, official b5 runs</td>
-        <td>20210-02-16</td> <td>40 failures</td><td> </td><td> </td>
+        <td>2021-03-01</td> <td>38 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.NetBSD.org/~martin/sparc64-atf/">sparc64</a>, real hardware</td>
-        <td>2021-02-07</td> <td>45 failures</td><td> </td><td>all wg(4) tests fail due to mbuf pool memory corruption</td>
-    </tr>
-    <tr>
-        <td><a href="//www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/HEAD/">XEN</a>, i386 and amd64</td>
-        <td>2021-02-14</td> <td>45 failures</td><td> </td><td> </td>
+        <td>2021-02-17</td> <td>37 failures</td><td> </td><td>all wg(4) tests fail due to mbuf pool memory corruption</td>
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/evbarm-atf/">evbarmv5</a>, real hardware</td>
-        <td>2021-02-15</td> <td>81 failures</td><td></td><td>userland watchdog starvation<br/>PR <a href="//gnats.netbsd.org/55272">55272</a></td>
+        <td>2021-03-01</td> <td>64 failures</td><td></td><td>userland watchdog starvation<br/>PR <a href="//gnats.netbsd.org/55272">55272</a></td>
     </tr>
     <tr>
         <td><a href="//releng.netbsd.org/b5reports/sparc64/">sparc64</a>, qemu, low memory</td>
-        <td>2021-02-11</td> <td>458 failures</td><td> </td><td> </td>
+        <td>2021-02-26</td> <td>431 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/landisk-atf/">landisk</a>, SH4, real hardware, low memory</td>
-        <td>2021-02-04</td> <td>132 failures</td><td>2021-01-05</td><td>pagedeamon lockups<br/>PR <a href="//gnats.netbsd.org/55491">55491</a></td>
+        <td>2021-03-01</td> <td>132 failures</td><td>2021-01-05</td><td>pagedeamon lockups<br/>PR <a href="//gnats.netbsd.org/55491">55491</a></td>
     </tr>
   </tbody>
 </table>

add Guide & Togetter:Open Source Conference 2021 Online/Spring NetBSD BoF
Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wikisrc/users/jun.mdwn	15 Feb 2021 10:12:35 -0000	1.44
+++ wikisrc/users/jun.mdwn	1 Mar 2021 11:01:56 -0000	1.45
@@ -9,6 +9,8 @@
 - Join meeting with ZOOM/YoutubeLive [[https://ospn.connpass.com/event/196661/]]
 - YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
 - 16:00-16:45 Room E Cross BUGLUG Community Camp 
+- [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2021tokyospring.pdf]]
+- [[https://togetter.com/li/1675363]]
 
 ## Open Source Conference 2021 Online/Nagoya NetBSD BoF
 - 2021 May.29 Sat XX:XX-XX:XX JST (UTC+9) TBD

Add PR 55997 as a regression since -9 (even if its cause is not clearly pinpointed to a kernel regression yet)
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wikisrc/releng/netbsd-10.mdwn	19 Feb 2021 18:47:43 -0000	1.36
+++ wikisrc/releng/netbsd-10.mdwn	27 Feb 2021 10:06:38 -0000	1.37
@@ -14,6 +14,7 @@
 * ~~[[!template id=pr number=55489]]: Infinite loop in "rump ifconfig bridge0 create"~~
 * ~~[[!template id=pr number=55509]]: npm install -g electron crashes the kernel~~
 * ~~[[!template id=pr number=55567]]: tcp-send slows down to slow single byte transfers~~
+* [[!template id=pr number=55997]]: lang/perl5 fails to build on NetBSD-current under COMPAT_NETBSD32
 
 ## PRs worth fixing
 

various links to man pages, etc
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	24 Feb 2021 08:31:25 -0000	1.143
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	27 Feb 2021 07:52:06 -0000	1.144
@@ -21,13 +21,15 @@
  - root filesystem can be uSD or USB-attached mass storage
  - serial or graphics console (with EDID query / parsing)
  - X11 via HDMI
- - GPU (VCHIQ) - 3D and video decode. man page missing.
- - USB host controller - dwctwo(4) and most devices work
- - Ethernet - usmsc(4), mue(4)
- - DMA controller driver and sdhc(4) support
+	- via framebuffer (and llvmpipe on AArch64), X11 does not use the VideoCore GPU
+ - GPU (OpenGL ES and video decoding acceleration) - [vchiq(4)](//man.netbsd.org/evbarm/vchiq.4)
+	- with 32-bit kernels only, see man page
+ - USB host controller - [dwctwo(4)](//man.netbsd.org/evbarm/dwctwo.4) and most devices work
+ - Ethernet - [usmsc(4)](//man.netbsd.org/usmsc.4), [mue(4)](//man.netbsd.org/mue.4)
+ - DMA controller driver and [sdhc(4)](//man.netbsd.org/sdhc.4) support
  - RNG
- - Audio: works. man page missing.
- - GPIO
+ - Audio - [vcaudio(4)](//man.netbsd.org/evbarm/vcaudio.4])
+ - GPIO - [bcmgpio(4)](//man.netbsd.org/evbarm/bcmgpio.4)
  - I²C: works, could use enhancements, man page
  - SPI: could use enhancements, man page
 
@@ -39,13 +41,12 @@
 ## NetBSD current
 
  - RPI4 (using EDK2 UEFI firmware)
-	- RPI4 Ethernet (Broadcom GENETv5) - genet(4)
+	- RPI4 Ethernet (Broadcom GENETv5) - genet(4); needs man page
  - RPI3/RPI4 audio with aarch64 kernels
 	- Previously the driver was only included with 32-bit (ARMv7/ARMv6)
-	  kernels and images due to the Broadcom code having 64-bit cleanliness
-	  issues.
+	  kernels, now works [due to dma-ranges](//mail-index.NetBSD.org/source-changes-d/2021/01/22/msg013133.html).
  - RPI3 builtin bluetooth
- - RPI3 and RPI0W builtin WiFi - bwfm(4)
+ - RPI3 and RPI0W builtin WiFi - [bwfm(4)](//man.netbsd.org/bwfm.4)
  - Big endian support
 
 ## What needs documenting if it works

xen: improve booting info
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- wikisrc/ports/xen/howto.mdwn	26 Feb 2021 18:39:20 -0000	1.190
+++ wikisrc/ports/xen/howto.mdwn	26 Feb 2021 19:03:20 -0000	1.191
@@ -107,19 +107,21 @@
 
 Support for PVHVM and PVH is available only in NetBSD-current.
 
-NetBSD as a dom0 does not run SMP, because some drivers are not yet
-safe for this.  \todo Link to more information about what needs work.
+NetBSD up to and including NetBSD 9 as a dom0 does not run SMP,
+because some drivers are not yet safe for this.  NetBSD-current
+supports SMP in dom0.
 
 NetBSD, when run as a domU, can and does typically run SMP.
 
-Note: NetBSD support is called XEN3.  However, it does support Xen 4,
-because the hypercall interface has remained identical.
+Note that while Xen 4.13 is current, the kernel support is still
+called XEN3, because the hypercall interface has not changed
+significantly.
 
 # Creating a NetBSD dom0
 
-In order to install a NetBSD as a dom0, one must first install a normal
-NetBSD system, and then pivot the install to a dom0 install by changing
-the kernel and boot configuration.
+In order to install a NetBSD as a dom0, one first installs a normal
+NetBSD system, and then pivot the install to a dom0 install by
+changing the kernel and boot configuration.
 
 In 2018-05, trouble booting a dom0 was reported with 256M of RAM: with
 512M it worked reliably.  This does not make sense, but if you see
@@ -127,12 +129,16 @@
 
 ## Installation of NetBSD
 
-[Install NetBSD/amd64](/guide/inst/)
-just as you would if you were not using Xen.
-Therefore, use the most recent release, or a build from the most recent stable branch.
+[Install NetBSD/amd64](/guide/inst/) just as you would if you were not
+using Xen.  Therefore, use the most recent release, or a build from
+the most recent stable branch.  Alternatively, use -current, being
+mindful of all the usual caveats of lower stability of current, and
+likely a bit more so.
 
 ## Installation of Xen
 
+### Building Xen
+
 Use the most recent version of Xen in pkgsrc, unless the DESCR says that it is not suitable.
 Therefore, choose 4.13.
 In the dom0, install xenkernel413 and xentools413 from pkgsrc.
@@ -144,28 +150,49 @@
 # cp -p /usr/pkg/xen413-kernel/xen.gz /
 """]]
 
-Then, place a NetBSD XEN3_DOM0 kernel in the `/` directory. Such kernel
-can either be compiled manually, or downloaded from the NetBSD FTP, for
-example at:
+Then, place a NetBSD XEN3_DOM0 kernel in the `/` directory. Such
+kernel can either be taken from a local release build.sh run, compiled
+manually, or downloaded from the NetBSD FTP, for example at:
 
 [[!template id=programlisting text="""
 ftp.netbsd.org/pub/NetBSD/NetBSD-9.1/amd64/binary/kernel/netbsd-XEN3_DOM0.gz
 """]]
 
-Add a line to /boot.cfg to boot Xen:
+### Configuring booting
+
+Read boot.cfg(8) carefully.  Add lines to /boot.cfg to boot Xen:
 
 [[!template id=filecontent name="/boot.cfg" text="""
 menu=Xen:load /netbsd-XEN3_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=512M
+menu=Xen single user:load /netbsd-XEN3_DOM0.gz console=pc -s;multiboot /xen.gz dom0_mem=512M
 """]]
 
+\todo Explain why console=pc is given.  Perhaps there is some notion
+of a separate console instead of xencons.
+
+\todo Check the single user line.
+
 This specifies that the dom0 should have 512MB of ram, leaving the rest
 to be allocated for domUs.
 
-NB: This says add, not replace, so that you will be able to boot a
-NetBSD kernel without Xen.  Once Xen boots ok, you may want to set it
-as default.
+NB: This says add, not replace, so that you will be able to more
+easily boot a NetBSD kernel without Xen.  Once Xen boots ok, you may
+want to set it as default.  It is highly likely that you will have
+trouble at some point, and keeping an up-to-date GENERIC for use in
+fixing problems is the standard prudent approach.
+
+### Console selection
+
+See boot_console(8).  Understand that you should start from a place of
+having console setup correct for booting GENERIC before trying to
+configure Xen.
+
+By default, the hypervisor (Xen itself) will use \todo as the console
 
-To use a serial console, add settings as follows:
+By default, the NetBSD dom0 kernel will use xencons(4) (the man page
+does not exist) as console.
+
+To use a serial console for the Xen hypervisor, add settings as follows:
 
 [[!template id=filecontent name="/boot.cfg" text="""
 menu=Xen:load /netbsd-XEN3_DOM0.gz;multiboot /xen.gz dom0_mem=512M console=com1 com1=9600,8n1
@@ -178,12 +205,21 @@
 which directs the console I/O through Xen to the same console device Xen
 itself uses (in this case, the serial port).
 
+\todo Explain why boot.cfg shows forcing the dom0 console also,
+separately from the hypervisor console.
+
+### Tuning
+
 In an attempt to add performance, one can also add `dom0_max_vcpus=1 dom0_vcpus_pin`,
 to force only one vcpu to be provided (since NetBSD dom0 can't use
 more) and to pin that vcpu to a physical CPU. Xen has
 [many boot options](http://xenbits.xenproject.org/docs/4.13-testing/misc/xen-command-line.html),
 and other than dom0 memory and max_vcpus, they are generally not
 necessary.
+\todo Revisit this advice with current.
+\todo Explain if anyone has ever actually measured that this helps.
+
+### rc.conf
 
 Ensure that the boot scripts installed in
 `/usr/pkg/share/examples/rc.d` are in `/etc/rc.d`, either because you
@@ -198,6 +234,8 @@
 
 \todo Recommend for/against xen-watchdog.
 
+### Testing
+
 Now, reboot so that you are running a DOM0 kernel under Xen, rather
 than GENERIC without Xen.
 
@@ -234,9 +272,9 @@
 There are (at least) two additional things different about NetBSD as a
 dom0 kernel compared to hardware.
 
-One is that the module ABI is different because some of the #defines
-change, so one must build modules for Xen.  As of netbsd-7, the build
-system does this automatically.
+One is that through NetBSD 9 the module ABI is different because some
+of the #defines change, so there are separate sets of modules in
+/stand.  In NetBSD-current, there is only one set of modules.
 
 The other difference is that XEN3_DOM0 does not have exactly the same
 options as GENERIC.  While it is debatable whether or not this is a
@@ -260,8 +298,8 @@
 replaces the kernel and reboots, and then overlays userland binaries
 and adjusts `/etc`.
 
-Note that one must update both the non-Xen kernel typically used for
-rescue purposes and the DOM0 kernel used with Xen.
+Note that one should update both the non-Xen kernel typically used for
+rescue purposes, as well as the DOM0 kernel used with Xen.
 
 ## anita (for testing NetBSD)
 
@@ -561,13 +599,11 @@
 
 \todo Explain where the kernel comes from.
 
-
 ## Creating a Solaris domU
 
 See possibly outdated
 [Solaris domU instructions](/ports/xen/howto-solaris/).
 
-
 ## PCI passthrough: Using PCI devices in guest domains
 
 NB: PCI passthrough only works on some Xen versions and as of 2020 it

xen: Demote info about migration from grub
At this point anything about grub is ancient history and there's no
reason to believe there are any maintained netbsd/xen systems with
grub. We already have a place to store the old info, so simply demote
the conversion information to tidy the main HOWTO.
Members: 
	ports/xen/howto-grub.mdwn:1.2->1.3 
	ports/xen/howto.mdwn:1.189->1.190 

Index: wikisrc/ports/xen/howto-grub.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto-grub.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/ports/xen/howto-grub.mdwn	24 Dec 2014 01:05:19 -0000	1.2
+++ wikisrc/ports/xen/howto-grub.mdwn	26 Feb 2021 18:39:20 -0000	1.3
@@ -6,6 +6,40 @@
 to use the native boot code, and that you probably should not be
 reading this.
 
+Converting from grub to /boot
+-----------------------------
+
+These instructions are provided only to help people using grub, which
+used to be the normal approach.
+
+These instructions were used to convert a system from
+grub to /boot.  The system was originally installed in February of
+2006 with a RAID1 setup and grub to boot Xen 2, and has been updated
+over time.  Before these commands, it was running NetBSD 6 i386, Xen
+4.1 and grub, much like the message linked earlier in the grub
+section.
+
+[[!template id=programlisting text="""
+# Install MBR bootblocks on both disks.
+fdisk -i /dev/rwd0d
+fdisk -i /dev/rwd1d
+# Install NetBSD primary boot loader (/ is FFSv1) into RAID1 components.
+installboot -v /dev/rwd0d /usr/mdec/bootxx_ffsv1
+installboot -v /dev/rwd1d /usr/mdec/bootxx_ffsv1
+# Install secondary boot loader
+cp -p /usr/mdec/boot /
+# Create boot.cfg following earlier guidance:
+menu=Xen:load /netbsd-XEN3PAE_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=512M
+menu=Xen.ok:load /netbsd-XEN3PAE_DOM0.ok.gz console=pc;multiboot /xen.ok.gz dom0_mem=512M
+menu=GENERIC:boot
+menu=GENERIC single-user:boot -s
+menu=GENERIC.ok:boot netbsd.ok
+menu=GENERIC.ok single-user:boot netbsd.ok -s
+menu=Drop to boot prompt:prompt
+default=1
+timeout=30
+"""]]
+
 Install
 -------
 
@@ -20,7 +54,6 @@
 Grub config
 -----------
 
-
     #Grub config file for NetBSD/xen. Copy as /grub/menu.lst and run
     # grub-install /dev/rwd0d (assuming your boot device is wd0).
     #
@@ -77,7 +110,6 @@
       chainloader +1
 
     ## end of grub config file.
-          
 
 Install grub with the following command:
 
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- wikisrc/ports/xen/howto.mdwn	19 Nov 2020 13:55:58 -0000	1.189
+++ wikisrc/ports/xen/howto.mdwn	26 Feb 2021 18:39:20 -0000	1.190
@@ -273,39 +273,6 @@
 anita --vmm=xl test file:///usr/obj/i386/
 """]]
 
-## Converting from grub to /boot (historical note)
-
-These instructions are provided only to help people using grub, which
-used to be the normal approach.
-
-These instructions were used to convert a system from
-grub to /boot.  The system was originally installed in February of
-2006 with a RAID1 setup and grub to boot Xen 2, and has been updated
-over time.  Before these commands, it was running NetBSD 6 i386, Xen
-4.1 and grub, much like the message linked earlier in the grub
-section.
-
-[[!template id=programlisting text="""
-# Install MBR bootblocks on both disks.
-fdisk -i /dev/rwd0d
-fdisk -i /dev/rwd1d
-# Install NetBSD primary boot loader (/ is FFSv1) into RAID1 components.
-installboot -v /dev/rwd0d /usr/mdec/bootxx_ffsv1
-installboot -v /dev/rwd1d /usr/mdec/bootxx_ffsv1
-# Install secondary boot loader
-cp -p /usr/mdec/boot /
-# Create boot.cfg following earlier guidance:
-menu=Xen:load /netbsd-XEN3PAE_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=512M
-menu=Xen.ok:load /netbsd-XEN3PAE_DOM0.ok.gz console=pc;multiboot /xen.ok.gz dom0_mem=512M
-menu=GENERIC:boot
-menu=GENERIC single-user:boot -s
-menu=GENERIC.ok:boot netbsd.ok
-menu=GENERIC.ok single-user:boot netbsd.ok -s
-menu=Drop to boot prompt:prompt
-default=1
-timeout=30
-"""]]
-
 # Unprivileged domains (domU)
 
 This section describes general concepts about domUs.  It does not

link to non-external package listings
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- wikisrc/templates/page.tmpl	2 Jan 2021 09:02:49 -0000	1.68
+++ wikisrc/templates/page.tmpl	24 Feb 2021 09:02:41 -0000	1.69
@@ -82,7 +82,7 @@
 		    Gallery</a></li>
 	<li><a href="//wiki.NetBSD.org/ports/">
 		    Ports</a></li>
-	<li><a href="http://pkgsrc.se/">
+	<li><a href="//cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/README.html">
 		    Packages</a></li>
 	</ul>
 	</li>

section was updated, reflect that
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	24 Feb 2021 08:22:48 -0000	1.142
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	24 Feb 2021 08:31:25 -0000	1.143
@@ -50,7 +50,6 @@
 
 ## What needs documenting if it works
 
- - (Everything listed in the previous section.)
  - CM1
  - CM3
  - CM3lite

various fixes
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	24 Feb 2021 08:05:57 -0000	1.141
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	24 Feb 2021 08:22:48 -0000	1.142
@@ -10,9 +10,7 @@
 
 <small>([Raspberry Pi image](http://www.flickr.com/photos/42325803@N07/8118758647/) by Christopher Lee used under CC-By-2.0 license)</small>
 
-# What works (and what doesn't yet)
-
-"Works" is primarily relative to the earmv6hf-el and earmv7hf-el CPU targets (32-bit).
+# What works
 
 ## NetBSD 8
 
@@ -25,7 +23,7 @@
  - X11 via HDMI
  - GPU (VCHIQ) - 3D and video decode. man page missing.
  - USB host controller - dwctwo(4) and most devices work
- - USB Ethernet - usmsc(4)
+ - Ethernet - usmsc(4), mue(4)
  - DMA controller driver and sdhc(4) support
  - RNG
  - Audio: works. man page missing.
@@ -40,14 +38,15 @@
 
 ## NetBSD current
 
+ - RPI4 (using EDK2 UEFI firmware)
+	- RPI4 Ethernet (Broadcom GENETv5) - genet(4)
  - RPI3/RPI4 audio with aarch64 kernels
 	- Previously the driver was only included with 32-bit (ARMv7/ARMv6)
 	  kernels and images due to the Broadcom code having 64-bit cleanliness
 	  issues.
  - RPI3 builtin bluetooth
- - RPI3 and RPI0W builtin WiFi
- - RPI4 (using EDK2 UEFI firmware)
-	- RPI4 Ethernet (Broadcom GENETv5, genet(4))
+ - RPI3 and RPI0W builtin WiFi - bwfm(4)
+ - Big endian support
 
 ## What needs documenting if it works
 
@@ -68,23 +67,21 @@
  - RPI0 uses "earmv6hf".
  - RPI0W uses "earmv6hf".
  - RPI2 uses "earmv7hf".
- - RPI2-1.2 uses "earmv7hf" or "aarch64" (armv8 CPU hardware)
- - RPI3 uses "earmv7hf" or "aarch64" (armv8 CPU hardware)
- - RPI4 uses "aarch64" (armv8 CPU hardware)
+ - RPI2-1.2 uses "earmv7hf" or "aarch64" (ARMv8 CPU hardware)
+ - RPI3 uses "earmv7hf" or "aarch64" (ARMv8 CPU hardware)
+ - RPI4 uses "aarch64" (ARMv8 CPU hardware)
 
-Note that one can run a build of earmv6hf on the 2 and 3.  There will still be a kernel7, built to use the 2/3 hardware, but with the armv6 instruction set.
-
-In theory the code compiled for earmv7hf will be faster, but anecdotal experience is that it doesn't matter that much.
-
-While the evbarm port has "eb" variants (for big-endian mode), the RPI systems do not support eb and these variants will not work.  Systems built for older CPU architectures (earm, earmv4, earmv5) are not expected to work on RPI.
+Note that one can run a build of earmv6hf on the 2 and 3.  There will still be a kernel7, built to use the 2/3 hardware, but with the armv6 instruction set.  In theory the code compiled for earmv7hf will be faster, but anecdotal experience is that it doesn't matter that much.  Builds of NetBSD for earlier revisions of ARM are unsupported.
 
 # Installation
 
+## Using standard images
+
 The simplest way is to download the appropriate SD card image from the NetBSD mirrors:
 
 - The Raspberry Pi 1 requires the ARMv6 [rpi.img.gz](http://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/evbarm-earmv6hf/binary/gzimg/rpi.img.gz).
 - The Raspberry Pi 2-3 can use the standard ARMv7 [armv7.img.gz](https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/evbarm-earmv7hf/binary/gzimg/armv7.img.gz) image.
-- The Raspberry Pi 3 can also use [https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/evbarm-aarch64/binary/gzimg/arm64.img.gz](arm64.img.gz).
+- The Raspberry Pi 3 can also use [arm64.img.gz](https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/evbarm-aarch64/binary/gzimg/arm64.img.gz).
 
 Decompress it and write it to the SD card:
 

Expand on 64-bit support, RPI4
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	16 Oct 2020 17:44:01 -0000	1.140
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	24 Feb 2021 08:05:57 -0000	1.141
@@ -1,12 +1,8 @@
 [[!meta title="NetBSD/evbarm on Raspberry Pi"]]
 
-This page describes the NetBSD/evbarm port on [Raspberry Pi](http://www.raspberrypi.org) hardware.  All [board variants](https://en.wikipedia.org/wiki/Raspberry_Pi#Specifications) earlier than the RPI4 are believed supported, and specific boards known to work are listed.  We use e.g. "RPI2" to refer to "Raspberry Pi 2" to save precious bytes on this page.  This web page is still 32-bit (aarch32) centric, even though as of mid-2020 aarch64 is also a normal approach.
+This page describes the NetBSD/evbarm port on [Raspberry Pi](http://www.raspberrypi.org) hardware.  All [board variants](https://en.wikipedia.org/wiki/Raspberry_Pi#Specifications) earlier than the RPI4 are believed supported, and specific boards known to work are listed.  We use e.g. "RPI2" to refer to "Raspberry Pi 2" to save precious bytes on this page.
 
-Initial, limited, Raspberry Pi support was introduced in NetBSD 6.0.  NetBSD 7.0 added complete support for the board, along with introducing support for the quad-core Raspberry Pi 2 board.  Raspberry Pi 3 support was added for NetBSD 8.  NetBSD 9 supports aarch64, meaning using the newer processors in 64-bit mode (via -current in mid 2018).
-
-Overall, this page takes the view that NetBSD 7 and earlier are obsolete; aside from history, it is written as if those versions don't exist.
-
-The HOWTO is written for what works on formal releases, release branches (e.g. netbsd-9) and NetBSD-current.  It purposefully does not contain instructions about how to get things to work by installing code that is still being tested and not yet in -current.
+Initial Raspberry Pi support was introduced in NetBSD 6.0.  NetBSD 7.0 added complete support for the board, along with introducing support for the quad-core Raspberry Pi 2 board.  Raspberry Pi 3 support was added for NetBSD 8.  NetBSD 9 supports aarch64, meaning using the newer processors in 64-bit mode.
 
 [[images/raspberrypi.jpg]]
 
@@ -44,14 +40,14 @@
 
 ## NetBSD current
 
+ - RPI3/RPI4 audio with aarch64 kernels
+	- Previously the driver was only included with 32-bit (ARMv7/ARMv6)
+	  kernels and images due to the Broadcom code having 64-bit cleanliness
+	  issues.
  - RPI3 builtin bluetooth
-
-## (maybe) NetBSD current, with manual steps
-
-   These items do not work in the sense that they simply function after a standard install.  Being listed here implies only that there has been list traffic that implies that after taking a bunch of steps (e.g. new firmware, new dtbs, enabling drivers, applying patches), one can end up with the feature working.  The HOWTO explicitly refrains from describing these steps because they are ephemeral.  However, the fact that list traffic indicates success is possible is a clue that proper support is on the horizon, and that is notable.
-
  - RPI3 and RPI0W builtin WiFi
- - RPI4
+ - RPI4 (using EDK2 UEFI firmware)
+	- RPI4 Ethernet (Broadcom GENETv5, genet(4))
 
 ## What needs documenting if it works
 
@@ -64,6 +60,7 @@
 
  - USB (host); isochronous transfers.
  - RPI0W Bluetooth Low Energy (probably)
+ - DRM/KMS
 
 # CPU types
 
@@ -73,38 +70,43 @@
  - RPI2 uses "earmv7hf".
  - RPI2-1.2 uses "earmv7hf" or "aarch64" (armv8 CPU hardware)
  - RPI3 uses "earmv7hf" or "aarch64" (armv8 CPU hardware)
- - RPI4 \todo
+ - RPI4 uses "aarch64" (armv8 CPU hardware)
 
 Note that one can run a build of earmv6hf on the 2 and 3.  There will still be a kernel7, built to use the 2/3 hardware, but with the armv6 instruction set.
 
-In theory the code compiled for earmv7hf will be faster, but anecdotal experience is that it doesn't matter that much.  \todo Post a link to a quality benchmark.
+In theory the code compiled for earmv7hf will be faster, but anecdotal experience is that it doesn't matter that much.
 
 While the evbarm port has "eb" variants (for big-endian mode), the RPI systems do not support eb and these variants will not work.  Systems built for older CPU architectures (earm, earmv4, earmv5) are not expected to work on RPI.
 
-The RPI2-1.2, RPI3 and RPI4 have an armv8 CPU that supports aarch64 (64-bit mode) in addition to aarch32 (regular 32-bit ARM).  This is supported, from 9 onwards, by the "aarch64" MACHINE_ARCH of evbarm, also available in build.sh via the alias evbarm64.  This is also referred to as [[NetBSD/aarch64|aarch64]].
-
 # Installation
 
-## SD card structure
+The simplest way is to download the appropriate SD card image from the NetBSD mirrors:
 
-The Raspberry Pi looks for firmware and kernel.img on the first FAT32 MBR partition of the uSD card.  A separate kernel (kernel7.img) is used on RPI2 and RPI3.
-The NetBSD kernel will then find NetBSD MBR partition and within that the root disklabel partition, and use that FFS partition as the root filesystem.
+- The Raspberry Pi 1 requires the ARMv6 [rpi.img.gz](http://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/evbarm-earmv6hf/binary/gzimg/rpi.img.gz).
+- The Raspberry Pi 2-3 can use the standard ARMv7 [armv7.img.gz](https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/evbarm-earmv7hf/binary/gzimg/armv7.img.gz) image.
+- The Raspberry Pi 3 can also use [https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/evbarm-aarch64/binary/gzimg/arm64.img.gz](arm64.img.gz).
 
-A 2 GB card is the smallest workable size that the installation image will fit on.  After the first boot, the system resizes the NetBSD root partition to fill the card.  Note that swap is after /boot and before /, and not contained in the NetBSD fdisk partition.  However, if you don't try to change the partition structure, this should not cause you any trouble.
+Decompress it and write it to the SD card:
 
-Note that SD cards generally have limited write tolerance, so you may wish to disable atime updates via the noatime option, as is done by the default installation.
+	$ gunzip armv7.img.gz
+	$ dd if=armv7.img of=/dev/rld0d conv=sync bs=1m progress=1
 
-## Choosing a version
+If you're not using NetBSD, your operating system's dd command's arguments may vary. On Windows, try [Rawrite32](https://www.netbsd.org/~martin/rawrite32/).
 
-First, decide if you want to install a formal release (8.0 or 9.0), a stable branch build (netbsd-8, netbsd-9), or NetBSD-current.  For people who don't know how to choose among those, a recent build of netbsd-9 is probably best, with 9.0 the choice for those who value being at exactly a formal release.
+The Raspberry Pi 4 requires the [UEFI firmware](https://github.com/pftf/RPi4/releases). Write the UEFI firmware to the SD card, and then insert an USB drive with the standard NetBSD `arm64.img` written to it. The Pi will then boot from USB.
 
-See also "ebijun's image", below, which is NetBSD-current and includes packages.
+The Raspberry Pi 3 can also [boot NetBSD from UEFI firmware](https://washbear.neocities.org/rpi3-netbsd-uefi.html), but the installation process is currently more complicated. However, there are some advantages, so you might want to try anyway.
+
+## SD card structure
 
-## Getting bits to install
+The Raspberry Pi looks for firmware and kernel.img on the first FAT32 MBR partition of the uSD card.  A separate kernel (kernel7.img) is used on RPI2 and RPI3.
+The NetBSD kernel will then find NetBSD MBR partition and within that the root disklabel partition, and use that FFS partition as the root filesystem.
 
-You can either build a release yourself with build.sh, or get a release from the NetBSD HTTPS/FTP servers.  The bits from both sources should match, except for things like  timestamps, or because the sources are from slightly different points along branches.
+A 2 GB card is the smallest workable size that the installation image will fit on.  After the first boot, the system resizes the NetBSD root partition to fill the card.  Note that swap is after /boot and before /, and not contained in the NetBSD fdisk partition.  However, if you don't try to change the partition structure, this should not cause you any trouble.
 
-### Building yourself
+Note that SD cards generally have limited write tolerance, so you may wish to disable atime updates via the noatime option, as is done by the default installation.
+
+## Building yourself
 
 Getting sources and building a release with build.sh is not special for evbarm.  However, the evbarm port has a very large number of CPU types, compared to i386 and amd64 which have one each.  The standard approach is to use -m to define MACHINE and -a to define MACHINE_ARCH.  build.sh supports aliases that can be passed as a MACHINE value, but denote both MACHINE and a MACHINE_ARCH.   The third line uses an alias and is equal to the second, for RPI2/3.  Note that the aliases start with "evb" while the MACHINE_ARCH values do not, and that aliases have "-el" or "-eb", while the MACHINE_ARCH values have no suffix or "eb".
 
@@ -114,28 +116,6 @@
 
 Consider setting RELEASEMACHINEDIR if you wish to build multiple MACHINE_ARCH values for a MACHINE; see build.sh.  Use something like "evbarm-earmv7hf", so that 1) earvm6 and earmv7 don't collide and 2) anita will recognize it as a type of evbarm.
 
-### NetBSD autobuild HTTPS/FTP servers
-
-NetBSD provides nightly builds on [nycdn.netbsd.org](https://nycdn.netbsd.org/pub/NetBSD-daily/).  The next directory level is the branch being built (netbsd-8, netbsd-9, HEAD, and more), plus optionally things like compiler type.  It is followed by date/time, e.g. "HEAD/201811051650Z"; once a build is complete the symlink "latest" is adjusted to point to it.  The next level is "${MACHINE}-${MACHINE_ARCH}", e.g. "evbarm-earmv7hf", and multiple combinations are provided.
-
-An example URL, arguably the standard approach for first-time NetBSD/RPI users, is <https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-8/latest/evbarm-earmv7hf/binary/gzimg/>
-
-### release layout
-
-Once you get to the releasedir, self-built and autobuild releases have the same structure.
-
- - The 'evbarm-earmv6hf/binary/gzimg/' directory contains an rpi.img file that will run on any of the RPI boards.
- - The 'evbarm-earmv7hf/binary/gzimg/' directory contains an armv7.img file that uses the armv7 instruction set, and thus can run only on the RPI2 and RPI3 (and perhaps the CM3).  It also supports systems other than the RPI family.
-
-\todo Explain why there is no armv7_inst.gz.
-
-## Preparing a uSD card
-
-Once you have rpi.img.gz (or rpi_inst for earmv6 boards), put it on a uSD card using gunzip and dd, for example:
-
- - gunzip rpi.img.gz
- - dd if=rpi.img of=/dev/disk1
-
 ## Console approaches
 
 The standard approach is to use a USB keyboard and an HDMI monitor for installation.
@@ -253,19 +233,14 @@
 
 ### NetBSD 8
 
-On NetBSD 8, dtb files are not used. (\todo Really?)
+On NetBSD 8, dtb files are not used.
 
 ### NetBSD 9
 
-(This is harder than it should be.)
 Build a release.  gunzip the armv7.img, vnconfig it, and mount the MSDOS partition (e) e.g. on /mnt.  Copy the dtb files from /mnt/foo.dtb to /boot, and from /mnt/dtb/foo.dtb to /boot/dtb.
 
 It seems that some systems, including RPI, require dtb files in /boot, and some expect them in /boot/dtb.
 
-\todo Explain if you only really need the right one for your system type.
-
-\todo Explain how one is supposed to be able to update these from the dtb files in releasedir/binary/kernel, or fix it to have the same structure.
-
 ### NetBSD current
 
 When updating, ensure that /boot is mounted and that you unpack the dtb set.
@@ -310,6 +285,12 @@
 
 # X11 and GPU
 
+Video acceleration currently only works with 32-bit (ARMv7 and ARMv6) kernels due to the Broadcom code not being 64-bit clean.
+
+Since applications require specialized support for the GPU, only a few applications are normally accelerated.  NetBSD/aarch64 normally uses `llvmpipe` to provide fast parallel CPU-driven support for OpenGL, so should be faster when running normal applications.
+
+The situation should be improved, ideally by writing a DRM/KMS driver.
+
 ## Video playback
 
 Accelerated video playback is supported with the [OMXPlayer](http://pkgsrc.se/multimedia/omxplayer) application and through GStreamer with the [omx](http://pkgsrc.se/multimedia/gst-plugins1-omx) plugin.

Index: wikisrc/ports/evbarm/odroid-c1.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/odroid-c1.mdwn,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- wikisrc/ports/evbarm/odroid-c1.mdwn	19 Feb 2021 23:12:00 -0000	1.34
+++ wikisrc/ports/evbarm/odroid-c1.mdwn	22 Feb 2021 01:47:18 -0000	1.35
@@ -42,7 +42,11 @@
 # dd if=u-boot.bin.odroidc1 of=armv7.img bs=512 seek=64 conv=notrunc
 """]]
 * Write the image to an SD card.
-* Tested 2021-02-19 with NetBSD-current, christos
+
+- Tested 2021-02-19 with NetBSD-current, christos
+  - serial fights with ucb keyboard. (avoid by short circuiting cngetc in meson_uart.c to return -1)
+  - awge0 does not work reliably (can't even get a dhcp address, stops receiving packets after less than a minute)
+  - machine crashes under load
 
 # Installation (NetBSD 7.0/7.1)
 

Index: wikisrc/ports/evbarm/odroid-c1.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/odroid-c1.mdwn,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wikisrc/ports/evbarm/odroid-c1.mdwn	19 Feb 2021 23:07:31 -0000	1.33
+++ wikisrc/ports/evbarm/odroid-c1.mdwn	19 Feb 2021 23:12:00 -0000	1.34
@@ -31,7 +31,7 @@
 # Installation (NetBSD 8.0 and later)
 
 * Start with an ARMv7 image from *evbarm-earmv7hf/binary/gzimg/* such as *armv7.img*, the latest is [[here|https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/latest/evbarm-earmv7hf/binary/gzimg/armv7.img]].
-* Build U-Boot for ODROID-C1 <hhttps://github.com/jaredmcneill/u-boot-odroid>
+* Build U-Boot for ODROID-C1 <https://github.com/jaredmcneill/u-boot-odroid>
   * Pre-built binaries here:
    <http://ftp.netbsd.org/pub/NetBSD/misc/jmcneill/odroidc1/u-boot-odroidc-v2011.03-20150308.tar.gz>
    <http://www.netbsd.org/~jmcneill/u-boot.bin.odroidc1>

Index: wikisrc/ports/evbarm/odroid-c1.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/odroid-c1.mdwn,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wikisrc/ports/evbarm/odroid-c1.mdwn	19 Feb 2021 23:06:17 -0000	1.32
+++ wikisrc/ports/evbarm/odroid-c1.mdwn	19 Feb 2021 23:07:31 -0000	1.33
@@ -42,6 +42,7 @@
 # dd if=u-boot.bin.odroidc1 of=armv7.img bs=512 seek=64 conv=notrunc
 """]]
 * Write the image to an SD card.
+* Tested 2021-02-19 with NetBSD-current, christos
 
 # Installation (NetBSD 7.0/7.1)
 

Index: wikisrc/ports/evbarm/odroid-c1.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/odroid-c1.mdwn,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wikisrc/ports/evbarm/odroid-c1.mdwn	19 Feb 2021 22:02:03 -0000	1.31
+++ wikisrc/ports/evbarm/odroid-c1.mdwn	19 Feb 2021 23:06:17 -0000	1.32
@@ -31,23 +31,17 @@
 # Installation (NetBSD 8.0 and later)
 
 * Start with an ARMv7 image from *evbarm-earmv7hf/binary/gzimg/* such as *armv7.img*, the latest is [[here|https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/latest/evbarm-earmv7hf/binary/gzimg/armv7.img]].
-* Build U-Boot for ODROID-C1 <https://github.com/hardkernel/u-boot/tree/odroidc-v2011.03>
-  * Pre-built binaries here: <http://ftp.netbsd.org/pub/NetBSD/misc/jmcneill/odroidc1/u-boot-odroidc-v2011.03-20150308.tar.gz>
+* Build U-Boot for ODROID-C1 <hhttps://github.com/jaredmcneill/u-boot-odroid>
+  * Pre-built binaries here:
+   <http://ftp.netbsd.org/pub/NetBSD/misc/jmcneill/odroidc1/u-boot-odroidc-v2011.03-20150308.tar.gz>
+   <http://www.netbsd.org/~jmcneill/u-boot.bin.odroidc1>
 * Write the bootloader to the empty space at the start of the base image:
 [[!template  id=programlisting text="""
 # dd if=bl1.bin.hardkernel of=armv7.img bs=1 count=442 conv=notrunc
 # dd if=bl1.bin.hardkernel of=armv7.img bs=512 skip=1 seek=1 conv=notrunc
-# dd if=u-boot.bin of=armv7.img bs=512 seek=64 conv=notrunc
+# dd if=u-boot.bin.odroidc1 of=armv7.img bs=512 seek=64 conv=notrunc
 """]]
 * Write the image to an SD card.
-* Edit *boot.ini* on the MS-DOS partition. Note that the default boot.ini has `console=fb` in `bootargs`, which you should remove if you want serial console:
-[[!template  id=programlisting text="""
-ODROIDC-UBOOT-CONFIG
-
-setenv bootargs "root=ld0a awge0.mac-address=${ethaddr} console=fb"
-setenv bootcmd "fatload mmc 0:1 0x21000000 netbsd-ODROID-C1.ub; bootm 0x21000000"
-run bootcmd
-"""]] 
 
 # Installation (NetBSD 7.0/7.1)
 

Index: wikisrc/ports/evbarm/odroid-c1.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/odroid-c1.mdwn,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- wikisrc/ports/evbarm/odroid-c1.mdwn	26 May 2020 13:46:46 -0000	1.30
+++ wikisrc/ports/evbarm/odroid-c1.mdwn	19 Feb 2021 22:02:03 -0000	1.31
@@ -30,7 +30,7 @@
 
 # Installation (NetBSD 8.0 and later)
 
-* Start with an ARMv7 image from *evbarm-earmv7hf/binary/gzimg/* such as *armv7.img*
+* Start with an ARMv7 image from *evbarm-earmv7hf/binary/gzimg/* such as *armv7.img*, the latest is [[here|https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/latest/evbarm-earmv7hf/binary/gzimg/armv7.img]].
 * Build U-Boot for ODROID-C1 <https://github.com/hardkernel/u-boot/tree/odroidc-v2011.03>
   * Pre-built binaries here: <http://ftp.netbsd.org/pub/NetBSD/misc/jmcneill/odroidc1/u-boot-odroidc-v2011.03-20150308.tar.gz>
 * Write the bootloader to the empty space at the start of the base image:

Move some bugs to "showstopper" status
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wikisrc/releng/netbsd-10.mdwn	16 Feb 2021 15:48:39 -0000	1.35
+++ wikisrc/releng/netbsd-10.mdwn	19 Feb 2021 18:47:43 -0000	1.36
@@ -1,9 +1,22 @@
 [[!meta title="NetBSD 10.0 preliminary tasklist"]]
 
-## PRs worth fixing
+## Showstopper bugs and PRs
 
 * **Any issues found by [syzbot](https://syzkaller.appspot.com/netbsd) may potentially crash
   the kernel and should be investigated and fixed.**
+* [[!template id=pr number=55272]]: userland watchdog processes may be outstalled
+* topdown uvm mmap assertion failure (PR upcoming) - PMAP_PREFER can cause KASSERT failure
+
+## Regressions since netbsd-9
+
+* ~~[[!template id=pr number=54913]]: fexecve(2) panics in chroot(8)~~
+* [[!template id=pr number=55370]]: Invalid modification/connection time with mount_null(8)
+* ~~[[!template id=pr number=55489]]: Infinite loop in "rump ifconfig bridge0 create"~~
+* ~~[[!template id=pr number=55509]]: npm install -g electron crashes the kernel~~
+* ~~[[!template id=pr number=55567]]: tcp-send slows down to slow single byte transfers~~
+
+## PRs worth fixing
+
 * ~~[[!template id=pr number=51734]]: hdaudio(4) "RIRB timeout" interrupt storm on boot~~
 * [[!template id=pr number=52583]]: iwm(4) "unhandled firmware response" followed by panic after extended use
 * [[!template id=pr number=53173]]: "go test net/http" locks up the machine
@@ -21,15 +34,6 @@
 * [[!template id=pr number=55533]]: mmap(2) fails when called with a non-zero hint
 * [[!template id=pr number=55892]]: npf cannot handle large tables
 
-## Regressions since netbsd-9
-
-* ~~[[!template id=pr number=54913]]: fexecve(2) panics in chroot(8)~~
-* [[!template id=pr number=55272]]: userland watchdog processes may be outstalled
-* [[!template id=pr number=55370]]: Invalid modification/connection time with mount_null(8)
-* ~~[[!template id=pr number=55489]]: Infinite loop in "rump ifconfig bridge0 create"~~
-* ~~[[!template id=pr number=55509]]: npm install -g electron crashes the kernel~~
-* ~~[[!template id=pr number=55567]]: tcp-send slows down to slow single byte transfers~~
-
 ## Test Regressions since netbsd-9
 Some of this issues are older (so "regression" is slightly wrong), but it was necessary to disable tests to not break whole test setups. This are likely effects caused by bugs in the tests or RUMP, so not considered show stoppers.
 

zfs: Note 80%
Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- wikisrc/zfs.mdwn	18 Feb 2021 00:26:35 -0000	1.39
+++ wikisrc/zfs.mdwn	18 Feb 2021 00:28:44 -0000	1.40
@@ -100,6 +100,10 @@
 Information about created or imported pools is stored in
 /etc/zfs/zpool.cache.
 
+Conventional wisdom is that a pool that is more than 80% used gets
+unhappy; so far there is not NetBSD-specific wisdom to confirm or
+refute that.
+
 ## pool native blocksize mismatch
 
 ZFS attempts to find out the native blocksize for a disk when using it

zfs: add swap hints
Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wikisrc/zfs.mdwn	17 Feb 2021 18:14:41 -0000	1.38
+++ wikisrc/zfs.mdwn	18 Feb 2021 00:26:35 -0000	1.39
@@ -187,7 +187,10 @@
 disklabels and gpt labels from a zvol.
 
 Doing "swapctl -a" on a zvol device node fails.  \todo Is it really
-true that NetBSD can't swap on a zvol?
+true that NetBSD can't swap on a zvol?  (When using a zvol for swap,
+standard advice is to avoid the "-s" option which avoids reserving the
+allocated space.  Standard advice is also to consider using a
+dedicated pool.)
 
 \todo Explain that one can export a zvol via iscsi.
 

zfs: spiff up zvol section
Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wikisrc/zfs.mdwn	17 Feb 2021 17:53:07 -0000	1.37
+++ wikisrc/zfs.mdwn	17 Feb 2021 18:14:41 -0000	1.38
@@ -177,19 +177,24 @@
 Within a ZFS pool, the standard approach is to have file systems, but
 one can also create a zvol, which is a block device of a certain size.
 
-\todo The zvol will appear as /dev/???? and can be used in many
-respects like a slice.  However, the system will not read disklabels
-and gpt labels from a zvol; in this respect it is more like a disklabel
-partition or wedge than a disk drive.
+As an example, "zfs create -V 16G tank0/xen-netbsd-9-amd64" creates a
+zvol (intended to be a virtual disk for a domU).
 
-\todo Explain that one can export a zvol via iscsi.
+The zvol in the example will appear as
+/dev/zvol/rdsk/tank0/xen-netbsd-9-amd64 and
+/dev/zvol/dsk/tank0/xen-netbsd-9-amd64 and can be used like a
+disklabel partition or wedge.  However, the system will not read
+disklabels and gpt labels from a zvol.
+
+Doing "swapctl -a" on a zvol device node fails.  \todo Is it really
+true that NetBSD can't swap on a zvol?
 
-\todo Explain if one can swap on a zvol.
+\todo Explain that one can export a zvol via iscsi.
 
-\todo Explain that one can use ccd to create a normal-looking disk
-from a zvol.  This allows reading a GPT label from the zvol, which is
-useful in case the zvol had been exported via iscsi and some other
-system created a label.
+One can use ccd to create a normal-looking disk from a zvol.  This
+allows reading a GPT label from the zvol, which is useful in case the
+zvol had been exported via iscsi and some other system created a
+label.
 
 # Memory usage
 

zfs: describe mountpoint conventions
Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wikisrc/zfs.mdwn	17 Feb 2021 17:44:58 -0000	1.36
+++ wikisrc/zfs.mdwn	17 Feb 2021 17:53:07 -0000	1.37
@@ -100,7 +100,7 @@
 Information about created or imported pools is stored in
 /etc/zfs/zpool.cache.
 
-## pool Native blocksize mismatch
+## pool native blocksize mismatch
 
 ZFS attempts to find out the native blocksize for a disk when using it
 in a pool; this is almost always 512 or 4096.  Somewhere between 9.0
@@ -138,6 +138,14 @@
 \todo Determine a good fix, perhaps man page changes only, fix it
 upstream, in curent, and in 9, before removing this discussion.
 
+## mountpoint conventions
+
+By default, datasets are mounted as /poolname/datasetname.  One can
+also set a mountpoint; see zfs(8).
+
+There does not appear to be any reason to choose explicit mountpoints
+vs the default (and either using data in place or symlinking to it).
+
 ## mount order
 
 NetBSD 9 mounts other file systems and then ZFS file systems.  This can

zfs: minor reorg
Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wikisrc/zfs.mdwn	17 Feb 2021 17:40:26 -0000	1.35
+++ wikisrc/zfs.mdwn	17 Feb 2021 17:44:58 -0000	1.36
@@ -8,17 +8,6 @@
 Many things are marked with \todo because they need a better
 explanation, and some have question marks
 
-# Documentation Pointers
-
-See the man pages for zfs(8), zpool(8).  Also see zdb(8), if only for
-seeing pool config info when run with no arguments.
-
-  - [OpenZFS Documentation](https://openzfs.github.io/openzfs-docs/)
-  - [OpenZFS admin docs index page](https://github.com/openzfs/zfs/wiki/Admin-Documentation)
-  - [FreeBSD Handbook ZFS Chapter](https://www.freebsd.org/doc/handbook/zfs.html)
-  - [Oracle ZFS Administration Manual](https://docs.oracle.com/cd/E26505_01/html/E37384/index.html)
-  - [Wikipedia](https://en.wikipedia.org/wiki/ZFS)
-
 # Status of ZFS in NetBSD
 
 ## NetBSD 8
@@ -36,20 +25,6 @@
 branch.  As of 2021-02, ZFS in the NetBSD 9.1 release is very close to
 netbsd-9.
 
-### Native blocksize
-
-ZFS attempts to find out the native blocksize for a disk when using it
-in a pool; this is almost always 512 or 4096.  Somewhere between 9.0
-and 9.1, at least some disks on some controllers that used to report
-512 now report 4096.  This provokes a blocksize mismatch warning.
-
-Given that the native blocksize of the disk didn't change, and things
-seemed OK using the 512 emulated blocks, the warning is likely not
-critical.  However, it is also likely that rebuilding the pool with
-the 4096 blocksize is likely to result in better behavior because ZFS
-will only try to do 4096-byte writes.  \todo Verify this and find the
-actual change and explain better.
-
 ## NetBSD-current
 
 NetBSD-current (as of 2021-02) has similar ZFS code to 9.
@@ -59,12 +34,13 @@
 
 ## NetBSD/xen special issues
 
+Summary: if you are using NetBSD, xen and zfs, use NetBSD-current.
+
 In NetBSD-9, MAXPHYS is 64KB in most places, but because of xbd(4) it
 is set to 32KB for XEN kernels.  Thus the standard zfs kernel modules
 do not work under xen.  In NetBSD-current, xbd(4) supports 64 KB
-MAXPHYS and this is no longer an issue.
-
-Xen and zfs on current are reported to work well together, as of 2021-02.
+MAXPHYS and this is no longer an issue.  Xen and zfs on current are
+reported to work well together, as of 2021-02.
 
 ## Architectures
 
@@ -92,7 +68,18 @@
   - Create a filesystem mounted on /n0 as "zfs create -o
     mountpoint=/n0 pool1/n0".
 
-  - Go back and read the documentation and start over.
+  - Read the documentation referenced in the next section.
+
+## Documentation Pointers
+
+See the man pages for zfs(8), zpool(8).  Also see zdb(8), if only for
+seeing pool config info when run with no arguments.
+
+  - [OpenZFS Documentation](https://openzfs.github.io/openzfs-docs/)
+  - [OpenZFS admin docs index page](https://github.com/openzfs/zfs/wiki/Admin-Documentation)
+  - [FreeBSD Handbook ZFS Chapter](https://www.freebsd.org/doc/handbook/zfs.html)
+  - [Oracle ZFS Administration Manual](https://docs.oracle.com/cd/E26505_01/html/E37384/index.html)
+  - [Wikipedia](https://en.wikipedia.org/wiki/ZFS)
 
 # NetBSD-specific information
 
@@ -113,6 +100,20 @@
 Information about created or imported pools is stored in
 /etc/zfs/zpool.cache.
 
+## pool Native blocksize mismatch
+
+ZFS attempts to find out the native blocksize for a disk when using it
+in a pool; this is almost always 512 or 4096.  Somewhere between 9.0
+and 9.1, at least some disks on some controllers that used to report
+512 now report 4096.  This provokes a blocksize mismatch warning.
+
+Given that the native blocksize of the disk didn't change, and things
+seemed OK using the 512 emulated blocks, the warning is likely not
+critical.  However, it is also likely that rebuilding the pool with
+the 4096 blocksize is likely to result in better behavior because ZFS
+will only try to do 4096-byte writes.  \todo Verify this and find the
+actual change and explain better.
+
 ## pool importing problems
 
 While one can "zpool pool0 /dev/wd0f" and have a working pool, this

zfs:formattting
Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- wikisrc/zfs.mdwn	17 Feb 2021 17:34:51 -0000	1.34
+++ wikisrc/zfs.mdwn	17 Feb 2021 17:40:26 -0000	1.35
@@ -117,13 +117,12 @@
 
 While one can "zpool pool0 /dev/wd0f" and have a working pool, this
 pool cannot be exported and imported straigthforwardly.  "zpool
-export" works fine, and deletes zpool.cache.
-
-"zpool import", however, only looks at entire disks (e.g. /dev/wd0),
-and might look at slices (e.g. /dev/dk0).  It does not look at
-partitions like /dev/wd0f, and there is no way on the command line to
-ask that specific devices be examined.  Thus, export/import fails for
-pools with disklabel partitions.
+export" works fine, and deletes zpool.cache.  "zpool import", however,
+only looks at entire disks (e.g. /dev/wd0), and might look at slices
+(e.g. /dev/dk0).  It does not look at partitions like /dev/wd0f, and
+there is no way on the command line to ask that specific devices be
+examined.  Thus, export/import fails for pools with disklabel
+partitions.
 
 One can make wd0 be a link to wd0f temporarily, and the pool will then
 be importable.  However, "wd0" is stored in zpool.cache and on the

zfs: mention zdb(8)
Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wikisrc/zfs.mdwn	17 Feb 2021 17:25:45 -0000	1.33
+++ wikisrc/zfs.mdwn	17 Feb 2021 17:34:51 -0000	1.34
@@ -10,7 +10,8 @@
 
 # Documentation Pointers
 
-See the man pages for zfs(8) and zpool(8).
+See the man pages for zfs(8), zpool(8).  Also see zdb(8), if only for
+seeing pool config info when run with no arguments.
 
   - [OpenZFS Documentation](https://openzfs.github.io/openzfs-docs/)
   - [OpenZFS admin docs index page](https://github.com/openzfs/zfs/wiki/Admin-Documentation)
@@ -163,7 +164,6 @@
 -maproot=0:10 causes a kernel NULL pointer dereference.  This is now
 fixed.
 
-
 ## zvol
 
 Within a ZFS pool, the standard approach is to have file systems, but

zfs: Explain how to import disklabel partitions
Also, catch up with NFS bugfixes and improvements
Members: 
	zfs.mdwn:1.32->1.33 

Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wikisrc/zfs.mdwn	14 Feb 2021 16:35:50 -0000	1.32
+++ wikisrc/zfs.mdwn	17 Feb 2021 17:25:45 -0000	1.33
@@ -109,6 +109,34 @@
   - disklabel partitions (e.g., /dev/sd0e)
   - wedges (e.g., /dev/dk0)
 
+Information about created or imported pools is stored in
+/etc/zfs/zpool.cache.
+
+## pool importing problems
+
+While one can "zpool pool0 /dev/wd0f" and have a working pool, this
+pool cannot be exported and imported straigthforwardly.  "zpool
+export" works fine, and deletes zpool.cache.
+
+"zpool import", however, only looks at entire disks (e.g. /dev/wd0),
+and might look at slices (e.g. /dev/dk0).  It does not look at
+partitions like /dev/wd0f, and there is no way on the command line to
+ask that specific devices be examined.  Thus, export/import fails for
+pools with disklabel partitions.
+
+One can make wd0 be a link to wd0f temporarily, and the pool will then
+be importable.  However, "wd0" is stored in zpool.cache and on the
+next boot that will attempt to be used.  This is obviously not a good
+approach.
+
+One an mkdir e.g. /etc/zfs/pool0 and in it have a symlink to
+/dev/wd0f.  Then, zpool import -d /etc/zfs/pool0 will scan
+/etc/zfs/pool0/wd0f and succeed.  The resulting zpool.cache will have
+that path, but having symlinks in /etc/zfs/POOLNAME seems acceptable.
+
+\todo Determine a good fix, perhaps man page changes only, fix it
+upstream, in curent, and in 9, before removing this discussion.
+
 ## mount order
 
 NetBSD 9 mounts other file systems and then ZFS file systems.  This can
@@ -126,13 +154,15 @@
 
 The "zfs share" command adds a line for each filesystem with the
 sharenfs property set to /etc/zfs/exports, and "zfs unshare" removes
-it.  \todo Explain if /etc/zfs/exports is used and whether this makes
-any sense on NetBSD.
+it.  This file is ignored on NetBSD-9 and current before 20210216; on
+current after 20210216 those filesystems should be exported (assuming
+NFS is enabled).  It does not appear to be possible to set options
+like maproot and network restrictions via this method.
 
-On current as of 20210214, a remote mkdir of a filesystem mounted via
+On current before 20210216, a remote mkdir of a filesystem mounted via
 -maproot=0:10 causes a kernel NULL pointer dereference.  This is now
-understood and expected to be fixed very soon.  See
-[misc/55042](http://gnats.netbsd.org/55042).
+fixed.
+
 
 ## zvol
 

Update test stats
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- wikisrc/releng/netbsd-10.mdwn	12 Feb 2021 19:51:08 -0000	1.34
+++ wikisrc/releng/netbsd-10.mdwn	16 Feb 2021 15:48:39 -0000	1.35
@@ -61,35 +61,35 @@
     </tr> ---->
     <tr>
         <td><a href="//releng.netbsd.org/b5reports/amd64/">amd64</a>, qemu, official b5 runs</td>
-        <td>2021-02-06</td> <td>22 failures</td><td> </td><td> </td>
+        <td>2021-02-16</td> <td>22 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.NetBSD.org/~martin/aarch64-atf/">evbarm64el-aarch64</a>, real hardware</td>
-        <td>2021-02-04</td> <td>25 failures</td><td> </td><td> </td>
+        <td>2021-02-11</td> <td>28 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/evbearmv7hf-atf/">evbearmv7hfeb</a>, real hardware</td>
-        <td>021-02-01</td> <td>33 failures</td><td> </td><td> </td>
+        <td>021-02-09</td> <td>37 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//releng.netbsd.org/b5reports/i386/">i386</a>, qemu, official b5 runs</td>
-        <td>20210-02-06</td> <td>39 failures</td><td> </td><td> </td>
+        <td>20210-02-16</td> <td>40 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.NetBSD.org/~martin/sparc64-atf/">sparc64</a>, real hardware</td>
-        <td>2021-02-04</td> <td>41 failures</td><td> </td><td>all wg(4) tests fail due to mbuf pool memory corruption</td>
+        <td>2021-02-07</td> <td>45 failures</td><td> </td><td>all wg(4) tests fail due to mbuf pool memory corruption</td>
     </tr>
     <tr>
         <td><a href="//www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/HEAD/">XEN</a>, i386 and amd64</td>
-        <td>2021-02-04</td> <td>49 failures</td><td> </td><td> </td>
+        <td>2021-02-14</td> <td>45 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/evbarm-atf/">evbarmv5</a>, real hardware</td>
-        <td>2021-02-04</td> <td>65 failures</td><td></td><td>userland watchdog starvation<br/>PR <a href="//gnats.netbsd.org/55272">55272</a></td>
+        <td>2021-02-15</td> <td>81 failures</td><td></td><td>userland watchdog starvation<br/>PR <a href="//gnats.netbsd.org/55272">55272</a></td>
     </tr>
     <tr>
         <td><a href="//releng.netbsd.org/b5reports/sparc64/">sparc64</a>, qemu, low memory</td>
-        <td>2021-02-03</td> <td>82 failures</td><td> </td><td> </td>
+        <td>2021-02-11</td> <td>458 failures</td><td> </td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/landisk-atf/">landisk</a>, SH4, real hardware, low memory</td>

[Date planning] OSC2021 Online/Nagoya,May29 and OSC2021 Online/Kyoto
Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- wikisrc/users/jun.mdwn	11 Feb 2021 03:45:36 -0000	1.43
+++ wikisrc/users/jun.mdwn	15 Feb 2021 10:12:35 -0000	1.44
@@ -11,7 +11,7 @@
 - 16:00-16:45 Room E Cross BUGLUG Community Camp 
 
 ## Open Source Conference 2021 Online/Nagoya NetBSD BoF
-- 2021 Jun.5 Sat XX:XX-XX:XX JST (UTC+9) TBD
+- 2021 May.29 Sat XX:XX-XX:XX JST (UTC+9) TBD
 - Join meeting with ZOOM/YoutubeLive 
 - YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
 
@@ -21,7 +21,7 @@
 - YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
 
 ## Open Source Conference 2021 Online/Kyoto NetBSD BoF
-- 2021 Jul-Aug XX Sat XX:XX-XX:XX JST (UTC+9) TBD
+- 2021 Jul.30-31 or Aug.6-7 Sat XX:XX-XX:XX JST (UTC+9) TBD
 - Join meeting with ZOOM/YoutubeLive 
 - YoutubeLive [[https://www.youtube.com/c/OSPNjp]]