MFC r250251:

Use FF02:0:0:0:0:2:FF00::/104 prefix for IPv6 Node Information Group
Address.  Although KAME implementation used FF02:0:0:0:0:2::/96 based on
older versions of draft-ietf-ipngwg-icmp-name-lookup, it has been changed
in RFC 4620.

The kernel always joins the /104-prefixed address, and additionally does
/96-prefixed one only when net.inet6.icmp6.nodeinfo_oldmcprefix=1.
The default value of the sysctl is 1.

ping6(8) -N flag now uses /104-prefixed one.  When this flag is specified
twice, it uses /96-prefixed one instead.

Reviewed by:		ume
Based on work by:	Thomas Scheffler
PR:			conf/174957


git-svn-id: svn://svn.freebsd.org/base/stable/9@252021 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r250523:

Add IFF_MONITOR support to gre(4).

Tested by:	Chip Marshall


git-svn-id: svn://svn.freebsd.org/base/stable/9@252023 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix mergeinfo.


git-svn-id: svn://svn.freebsd.org/base/stable/9@252024 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix a copy/paste error introduced by r248313 (s/ftp/http/ in menu text).

MFC after:	3 days


git-svn-id: svn://svn.freebsd.org/base/stable/9@252025 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r248573:
Don't register repair writes in the trim map.


git-svn-id: svn://svn.freebsd.org/base/stable/9@252027 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC: r249406

- Do not bail out if stat(2) fails with ENOENT in the spool directory. This
  happens if another atrm process removes a job while we're scanning through
  the directory.
- While at it, optimize a bit the directory scanning, so that we quit
  looping as soon as all jobs specified in argv have been dealt with.

Approved by:	cognet


git-svn-id: svn://svn.freebsd.org/base/stable/9@252035 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix two swapped definitions.  Note it is directly committed to this branch
because it fixes r250496, i.e., MFC of r247369 to stable/9.


git-svn-id: svn://svn.freebsd.org/base/stable/9@252038 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC 251617:
Store a reference to the vnode associated with a file descriptor in the
linux_file structure and use it instead of directly accessing td_fpop
when destroying the linux_file structure.  The td_fpop pointer is not
valid when a cdevpriv destructor is run, and the type-specific close
method has already been called, so f_vnode may not be valid (and the
vnode might have been recycled without our own reference).


git-svn-id: svn://svn.freebsd.org/base/stable/9@252041 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r251439: Remove unneeded reference to link.h (sys/link_elf.h).


git-svn-id: svn://svn.freebsd.org/base/stable/9@252043 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r251440: use calloc().


git-svn-id: svn://svn.freebsd.org/base/stable/9@252044 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
share/mk: merge: r241298,243393,249057,251506 from head for bmake support.

Makefile: buildworld etc will be done with make from src tree,
make sure that bmake's -J 15,16 are not passed to it.

Reviewed by: obrien


git-svn-id: svn://svn.freebsd.org/base/stable/9@252048 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Merge remote-tracking branch 'upstream/svn_stable_9' into svn_stable_9