Pull up following revision(s) (requested by msaitoh in ticket #804):
	sys/arch/arm/arm/disksubr_mbr.c: revision 1.15
Change for non MBR disk (PR#47463):
  - Check each mbrp_type field in fdisk partition table in MBR to know whether
    a sector is really MBR or not. Same as MI subr_disk_mbr.c
  - Check whether each number in a partition table is out of bound or not.
    Same as MI subr_disk_mbr.c
  - Update d_packname and d_npartitions if we found any partitions.
  - Currently, the exended partitions is not supported...
Pull up following revision(s) (requested by tron in ticket #805):
	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 manu in ticket #806):
	crypto/external/bsd/openssl/dist/engines/ccgost/gost_eng.c: revision 1.2
Pull multiple free bua fix from upstream:
http://git.openssl.org/gitweb/?p=openssl.git;a=patch;h=d21bf10dea6588b63
2a65b4fe594e04f288aad83;hp=d47c01a31a67ff4370b1883a58cabd0279752bb4
Multiple copies of the ENGINE will cause problems when it is cleaned up
as
the methods are stored in static structures which will be overwritten
and
freed up more than once.
Set static methods to NULL when the ENGINE is freed so it can be
reloaded.
Tickets 804-806.
Pull up following revision(s) (requested by tron in ticket #807):
	usr.bin/flock/flock.c: revision 1.7
Don't crash if "flock" is used to lock a file descriptor e.g. via
"flock --nb 8".
ticket 807
Pull up following revision(s) (requested by hannken in ticket #808):
	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)
ticket 808.
Pull up following revision(s) (requested by skrll in ticket #809):
	sys/dev/spi/spi.c: revision 1.7
Don't leak condvars and mutexes, even if they are on the stack.
Fixes LOCKDEBUG asserts when a mutex/condvar is initialized at the same
stack address as a previous initialization.  We probably want to revisit
the transfer structure lifecyle at some point in the future.
ticket 809
Pull up following revision(s) (requested by hannken in ticket #810):
	sys/dev/fss.c: revision 1.85
Lookup the block device mounted on from the specfs_hash table.
This doesn't belong here but makes it possible to pullup.
Fixes PR kern/47020 (fss(4) panic)
Pull up following revision(s) (requested by rmind in ticket #811):
	sys/kern/subr_pserialize.c: revision 1.7
- pserialize_switchpoint: check for passing twice, not more than needed.
- pserialize_perform: avoid a possible race with softint handler.
Reported by hannken@.
Tickets 810, 811.
Pull up following revision(s) (requested by veego in ticket #812):

external/mit/xorg/server/drivers/xf86-video-radeon/Makefile		patch
xsrc/external/mit/xf86-video-ati/dist/ChangeLog				patch
xsrc/external/mit/xf86-video-ati/dist/INSTALL				patch
xsrc/external/mit/xf86-video-ati/dist/Makefile.in			patch
xsrc/external/mit/xf86-video-ati/dist/aclocal.m4			patch
xsrc/external/mit/xf86-video-ati/dist/config.h.in			patch
xsrc/external/mit/xf86-video-ati/dist/configure				patch
xsrc/external/mit/xf86-video-ati/dist/configure.ac			patch
xsrc/external/mit/xf86-video-ati/dist/ltmain.sh				patch
xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in			patch
xsrc/external/mit/xf86-video-ati/dist/man/radeon.man			patch
xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am			patch
xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in			patch
xsrc/external/mit/xf86-video-ati/dist/src/ati.c				patch
xsrc/external/mit/xf86-video-ati/dist/src/ati.h				patch
xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/cayman_shader.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_accel.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_shader.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_textured_videofuncs.c patch
xsrc/external/mit/xf86-video-ati/dist/src/generic_bus.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_accelfuncs.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_bios.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_output.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_chipset_gen.h	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_device_match_gen.h	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_videofuncs.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_vip.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/theatre.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/theatre200.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/pcidb/ati_pciids.csv		patch
xsrc/external/mit/xf86-video-ati/include/config.h			patch

	Update Xorg ATI driver to version 6.14.6.
	[veego, ticket #812]

NetBSD note: The libdrm requirement seems to be KMS related which we do
             not have.

* 6.14.6
  This version requires the latest libdrm 2.4.36 release, and fixes a few
  other bugs seen since 6.14.5.
* 6.14.5
  - add solid picture accel
  - tiling fixes
  - new pci ids
  - 6xx-9xx Xv improvements
  - support for upcoming xserver API changes
  - bug fixes
Ticket 812.
Pull up following revision(s) (requested by khorben in ticket #814):
	sbin/wsconsctl/wsconsctl.h: revision 1.12
	sbin/wsconsctl/mouse.c: revision 1.9
	sbin/wsconsctl/mouse.c: revision 1.10
	sbin/wsconsctl/util.c: revision 1.31
Added a field type for signed integers. This is required when handling
touchscreen calibration values, which is about to be implemented in
wsconsctl (see PR kern/45872).
Reviewed by uwe@ (thank you!)
Added a field type for signed integers. This is required when handling
touchscreen calibration values, which is about to be implemented in
wsconsctl (see PR kern/45872).
Reviewed by uwe@ (thank you!)
Added read-only support for touchscreen calibration (see PR kern/45872).
Tested with the uts(4) driver, as well as with mice without calibration
support.
Reviewed by uwe@ (thank you!)
Added complete support for touchscreen calibration (see PR kern/45872).
Tested with the uts(4) driver, as well as with mice without calibration
support.
Reviewed by uwe@ (thank you!)
Pull up following revision(s) (requested by khorben in ticket #815):
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.92
	sys/arch/i386/conf/XEN3_DOM0: revision 1.72
Added wpi(4) to the XEN3_DOM0 kernel for both amd64 and i386
Tested on a Lenovo ThinkPad T60 2007 (amd64)
Pull up following revision(s) (requested by khorben in ticket #816):
	sys/dev/usb/u3g.c: revision 1.26
Added the device id for the Huawei EM770W 3G modem to u3g(4)
Confirmed to work on a WeTab
ok christos@
Pull up following revision(s) (requested by rmind in ticket #817):
	usr.sbin/npf/npfctl/npfctl.8: revision 1.12
	usr.sbin/npf/npfctl/npf.conf.5: revision 1.27
	usr.sbin/npf/npfctl/npf_parse.y: revision 1.18
	usr.sbin/npf/npfctl/npf_build.c: revision 1.20
	usr.sbin/npf/npfctl/npfctl.c: revision 1.28
	lib/libnpf/npf.c: revision 1.16
	usr.sbin/npf/npfctl/npfctl.c: revision 1.29
	lib/libnpf/npf.c: revision 1.17
	sys/modules/npf/Makefile: revision 1.12
	sys/net/npf/npf_rproc.c: revision 1.6
	usr.sbin/npf/npftest/README: revision 1.4
	sys/net/npf/npf_tableset.c: revision 1.17
	sys/net/npf/npf_ctl.c: revision 1.21
	sys/net/npf/npf_ctl.c: revision 1.22
	usr.sbin/npf/npfctl/npfctl.h: revision 1.25
	lib/libnpf/npf.h: revision 1.13
	usr.sbin/npf/npftest/npftest.conf: revision 1.2
	usr.sbin/npf/npfctl/npfctl.h: revision 1.26
	sys/net/npf/npf_ruleset.c: revision 1.17
	lib/libnpf/npf.h: revision 1.14
	sys/net/npf/npf_ruleset.c: revision 1.18
	sys/net/npf/npf_conf.c: revision 1.1
	usr.sbin/npf/npfctl/npf_scan.l: revision 1.10
	sys/net/npf/npf_conf.c: revision 1.2
	sys/net/npf/npf_instr.c: revision 1.16
	sys/net/npf/npf_handler.c: revision 1.26
	sys/net/npf/npf_impl.h: revision 1.26
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.14
	sys/net/npf/npf_processor.c: revision 1.15
	sys/net/npf/npf_impl.h: revision 1.27
	sys/net/npf/npf_alg_icmp.c: revision 1.15
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.15
	usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.16
	sys/net/npf/npf_ncode.h: revision 1.11
	sys/net/npf/files.npf: revision 1.10
	usr.sbin/npf/npftest/Makefile: revision 1.4
	usr.sbin/npf/npfctl/npfctl.c: revision 1.30
	lib/libnpf/npf.3: revision 1.8
	usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.4
	sys/net/npf/npf_session.c: revision 1.21
	usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.5
	usr.sbin/npf/npfctl/npf_build.c: revision 1.18
	usr.sbin/npf/npfctl/npf_build.c: revision 1.19
	sys/net/npf/npf_alg.c: revision 1.7
	usr.sbin/npf/npfctl/Makefile: revision 1.10
	sys/net/npf/npf_inet.c: revision 1.21
	sys/net/npf/npf.h: revision 1.26
	sys/net/npf/npf.h: revision 1.27
	usr.sbin/pf/ftp-proxy/Makefile: revision 1.8
	sys/net/npf/npf_nat.c: revision 1.19
	sys/net/npf/npf.c: revision 1.15
	sys/net/npf/npf_state.c: revision 1.14
	sys/net/npf/npf_sendpkt.c: revision 1.14
	sys/rump/net/lib/libnpf/Makefile: revision 1.4
IPv6 linklocal address printing cosmetics
NPF:
- Implement dynamic NPF rules.  Controlled through npf(3) library of via
  npfctl rule command.  A rule can be removed using a unique identifier,
  returned on addition, or using a key which is SHA1 hash of the rule.
  Adjust npftest and add a regression test.
- Improvements to rule inspection mechanism.
- Initial BPF support as an alternative to n-code.
- Minor fixes; bump the version.
Disable -DWITH_NPF for now; will be converted to BPF mechanism.
- Fix NPF config reload with dynamic rules present.
- Implement list and flush commands on a dynamic ruleset.
Allow filtering on IP addresses even if the L4 protocol is unknown.
Patch from spz@.
npftest: adjust for recent change.
tickets 814-817.