Pull up following revision(s) (requested by apb in ticket #1848):
	etc/MAKEDEV.tmpl: revision 1.161
The console major number is not always 0; when creating a temporary
console while populating a memory disk, use %CONSOLE_CMAJOR% instead
of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent
major number.
This fixes a bug that I introduced in revision 1.82 dated 2007-03-11.
Pull up following revision(s) (requested by tron in ticket #1849):
	etc/rc.d/wpa_supplicant: revision 1.4
Make custom "reload" target work. Before this fix it would have tried
to send a HUP signal to "wpa_supplicant" instead.
Pull up following revision(s) (requested by gdt in ticket #1851):
	bin/sh/expand.c: revision 1.88
	bin/sh/expand.h: revision 1.19
Fix the expansion of "$(foo-$bar}" so that IFS isn't applied when
expanding $bar.
Noted by Greg Troxel on tech-userlevel running some 'git' tests.
Should fix PR bin/47361
Pull up following revision(s) (requested by gdt in ticket #1853):
	sys/dev/fss.c: revision 1.84
Take fss_device_lock first when closing a fss device.
Fixes PR kern/47514 (Multiple dump -X triggers kernel panic in fss_ioctl)
Apply patch (requested by sborrill in ticket #1858):
	sys/arch/amd64/conf/XEN3_DOMU
	sys/arch/i386/conf/Attic/XEN2_DOMU
Add wedge support in DOMU kernels.
Pull up following revision(s) (requested by minoura in ticket #1861):
	sys/dev/pci/if_vioif.c: revision 1.4
Fix a typo, and remove an unused member.
This should fix the problem that recent Qemu dies during configuring a vioif.
Fixes PR#47780.
Ticket 1848, 1849, 1851, 1853, 1858 and 1861.
Pull up following revision(s) (requested by christos in ticket #1845):
	dist/nvi/common/conv.c: revision 1.7
It is ridiculous to truncate files on character conversions without
warning and a chance for recovery. This patch sets the handler to
copy the character, clear the error and proceed instead of bailing
out.
To replicate:
	- unset LANG
	- Create a file that has ~1000 lines. Put a single bad character
	- '\344' in it, around 2/3rds of the file down. Save it.
	- export LANG=en_US.UTF-8
	- edit the file. Notice there is no error for input conversion,
	  since nvi reads the file opportunistically.
	- :w Boom, the file is truncated.
Alternatively, you can put that character in the first line of the file,
and watch the fireworks. If you like to restore the previous behavior
compile with -DERROR_ON_CONVERT
XXX: Pullup to 6, 5 etc.
Ticket 1845 & cleanup.
Cleanup.
Pull up following revision(s) (requested by fair in ticket #1855):
	sys/netinet/ip_icmp.c: revision 1.130
PR/47693: Erik E. Fair: Add missing code to icmp handling.
- While there, add the rest of the missing codes
- Merge groups
- Fix indentation
Ticket 1855.