Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Revert r288682

I meant to do this on ^/user/ngie/more-tests

Pointyhat to: ngie (use svn info next time...)

Update ipfilter 4.1.28 --> 5.1.2.

Approved by: glebius (mentor)
BSD Licensed by: Darren Reed <darrenr@reed.wattle.id.au> (author)

Resolve conflicts

MFC after: 1 weeks

Resolve conflicts (and believe me...you don't want to know).

This commit was generated by cvs2svn to compensate for changes in r153877,
which included commits to RCS files with non-trunk default branches.

Fix include directives that were missing the netinet include directory, where
the ipl.h file is found. Also add back in ip_fil.c, which somehow went missing
in action.

* Someone imported a lot of files with the wrong CVS tag, so lots of files need
that fixed in them....
* Keep unnecessary files out of the non-vendor part of this CVS repository.

This commit was generated by cvs2svn to compensate for changes in r145510,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r92686,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r72003,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r60841,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r53024,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r34739,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r31183,
which included commits to RCS files with non-trunk default branches.