Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

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

MFH (r263160): remove lukemftpd

Merge r267482,r267483,r267486,r267577,r267671,r267672 from head:

Remove send-pr and fix up all references to it. Replace it with a
stub send-pr directing people towards the web site.

Hoist all the mergeinfo up to the root in preparation for enforcing merges
to the root only. All MFC's were rerecorded to the root.

Going forward, if an MFC includes mergeinfo, it will need to be made to
the root and committed from the root. Merges with --ignore-ancestry
or diff | patch can go anywhere.

The mergeinfo in HEAD is in a bad state from years of neglect and manual
tampering and this was branched into 10.x. This confuses the coalescing
code and prevents it from doing its job.

Approved by: re (gjb, implicit)

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

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

Add myself as maintainer for nvme(4), nvd(4) and nvmecontrol(8).

Use my @freebsd.org username, rather than ${WORK} username.

Pointy hat provided by: kib, thankyou!

Update maintainers with ath/net80211.

Drop any connection to newsyslog. I haven't worked on it for quite
some time. Note that I do want to keep the pre-commit review for
usr.sbin/lpr. I am actively working on some updates for that.

Oh wow.. disassociate/disown any connection with cvs.

Update wiht the times.

MAINTAINERS: Document my maintainership of sh(1).

Fix typo ('a' and 'o' are not the same letter apparently)

Approved by: cperciva (implicit)

Finish migration of MAINTAINER entries

Approved by: cperciva
MFC after: 3 days

Disconnect non-MPSAFE NWFS from the build in preparation for dropping
GIANT from VFS. In addition, disconnect also netncp, which is a base
requirement for NWFS.

In the possibility of a future maintenance of the code and later
readd to the FreeBSD base, maybe we should think about a better location
for netncp. I'm not entirely sure the / top location is actually right,
however I will let network people to comment on that more specifically.

This is not targeted for MFC.

Disconnect non-MPSAFE XFS from the build in preparation for dropping
GIANT from VFS.

This is not targeted for MFC.

Remove my pre-commit review request for mergemaster

We moved to subversion ages ago.

Approved by: cperciva
MFC after: 3 days

Add isci(4) driver for amd64 and i386 targets.

The isci driver is for the integrated SAS controller in the Intel C600
(Patsburg) chipset. Source files in sys/dev/isci directory are
FreeBSD-specific, and sys/dev/isci/scil subdirectory contains
an OS-agnostic library (SCIL) published by Intel to control the SAS
controller. This library is used primarily as-is in this driver, with
some post-processing to better integrate into the kernel build
environment.

isci.4 and a README in the sys/dev/isci directory contain a few
additional details.

This driver is only built for amd64 and i386 targets.

Sponsored by: Intel
Reviewed by: scottl
Approved by: scottl

Farewall, sysinstall! You served us well for many years, but 10.0 is one
digit beyond your time.

Various sysinstall dependencies (e.g. libftpio, libdisk, libodialog, etc.)
will be cleaned up in coming days. Some will take longer than others due to
a few other consumers (tzsetup and sade).

- Remove myself from ncurses maintainer due to ENOTIME

Approved by: re (kib@)

Encourage Ben Laurie to finish getting his commit bit by appointing him
as the OpenSSL maintainer.

With hat: security-officer
Reviewed by: simon (former maintainer)

- Initial release of bxe(4) to support Broadcom NetXtreme II 10GbE.
(BCM57710, BCM57711, BCM57711E)

MFC after: One month

Drop my OpenSSL maintainer hat. I don't have the motivation to keep
chasing updates etc.

Leave a reminder not to commit non-upstream changes (ref: Debian
random...).

Add a comment to MAINTAINERS indicating that sbin/routed is in fact
vendor branch code from before contrib existed in FreeBSD's history.

Changes should be run by Vernon Schryver at Rhyolite first.

People working on sysinstall are encouraged to contact randi to
coordinate major changes.

Tighten my grip on pseudofs, procfs, linprocfs.

Remove some stale entries from MAINTAINERS:
- aradford@amcc.com bounces.
- gad said to drop pkill(1) and ps(1).
- jmallett said to drop libufs.
- joerg said to drop fdc(4) and sppp(4)

Submitted by: linimon
Approved by: gad, jmallett, joerg (via linimon)

wollman@ has OK'd dropping his maintainership of zic(8)

Submitted by: linimon
Approved by: wollman (via linimon)

Add heads-up requests for parts of the tree I look after and which
are partly maintained by a third party:

- share/zoneinfo
- usr.sbin/zic
- lib/libc/stdtime

Removing pre-commit review on isp(4). It's time to let people have their
way with it, if they so choose. I've been fooling with it since 1997.
Enough.

Register a request that all changes to *env(3) be reviewed by secteam
prior to commit due to the problematic history of this code.

- pkg_install is maintained by portmgr.
- BSD.x11{,-4}.dist aren't used anymore and BSD.local.dist now lives
in ports/Templates/. Most people apparently missed that move and still
commit to the src copy, so I'll have to remove it eventually but for
now, the MAINTAINERS line can go.

Approved by: re (kib)

Remove usb. The need to have core@ approve major changes to usb has
passed now that the new usb stack is in the tree. The coordination
issues that necessitated this entry are now OBE.

Approved by: core (rwatson)

Replace anholt with myself as drm maintainer.

Noticed by: miwi

MFC after: 3 days

Remove self.

Update description text

- Associate myself with ncurses

Dis-associate from ncurses.

Abandon pppd/chat

OLDCARD is gone, release imp's lock.

Approved by: imp

Update the maintainer id for em driver.

Note core's interest in coordinating major changes to our usb code base.

Claim maintainership of ZFS.

Request pre-commit review of BSD.{local,x11*}.dist by portmgr, since these
files interface with ports and we have policies for how/when they should be
updated.

Add myself as OpenSSL janitor/maintainer.

Add FreeBSD Update 2.0 client code. The build code is in the projects
repository.

Sponsored by: FreeBSD security development fundraiser

Remove pre-commit review on mpt.

More inactive maintainers.

Remove dhcp entries. They have been incorrect since the import from
OpenBSD.

Housekeeping. Update for maintainers who have handed in their commit bits
or (in my case) no longer feel that oversight is necessary.

Remove stale entries.

Add scottl to maintainers to ask for Pre-commit review on all busdma
changes. I was unaware of Scott's claim in this area and was abruptly
so informed. Let's put such an interest in some visible place.

document that I'm still maintaining kqueue and want to review commits to
it before they hit the tree...

Vinod has passed the maintainership for the twa/twe drivers to
Adam Radford as follows:

twe aradford@amcc.com Pre-commit review requested
twa aradford@amcc.com Pre-commit review requested

With hat: core-secretary
Requested by: vkashyap

Add Russell Cattelan to list of pre-commit reviewers for changes to XFS.

Requested by: Russell Cattelan <cattelan at xfs dot org>

Saying that asr(4) has a maintainer is like saying that a politician has
integrity.

Add OpenBSM and src/sys/security/audit to the maintainer list.

Remove extra geom_zero.

Noticed by: pjd

Request pre-commit review for XFS.

Note that bugmaster would like to review commits to send-pr.

Add myself as a maintainer of Bluetooth code

Add portsnap to the base system. This is a secure, easy to use,
fast, lightweight, and generally good way for users to keep their
ports trees up to date.

This is version 0.9.4 from the ports tree (sysutils/portsnap) with
the following changes:
1. The experimental pipelined http code is enabled. No seatbelts
in -CURRENT. (^_^)
2. The working directory has moved from /usr/local/portsnap to
/var/db/portsnap (as discussed on -arch two days ago).
3. Portsnap now fetches a list of mirrors (distributed as DNS SRV
records) and selects one randomly. This should help to avoid the
uneven loading which plagues the cvsup mirror network.
4. The license is now 2-clause BSD instead of 3-clause BSD.
5. Various incidental changes to make portsnap fit into the base
system's build mechanics.

X-MFC-After: 6.0-RELEASE
X-MFC-Before: 5.5-RELEASE
X-MFC-To: RELENG_6, RELENG_5, ports
discussed on: -arch and several other places
"yes please" from: simon, remko, flz, Diane Bruce
thinks this is a great idea: bsdimp
Hopes he didn't forget any files: cperciva

Add myself as a maintainer of GELI and GZERO classes.

Mention that I'd like to review commits to bsdiff and bspatch.

Since there's no emulation person, move the entry to upper section

Release n_hibma's maintainership due to his ENOTIME.

Discussed with, okayed, authorized, requested by, on behalf of: n_hibma (MAINTAINER)

Remove my involvement from the regression test stuff, I don't know the modified
framework well, and nobody's ever sought my help with writing regression tests,
most people just don't bother with them at all, regrettably.

Missed rwatson's redundancy

Remove libz and pppd redundancy

Tidy up cvs entries (missed one)

Drop maintainership.

Tidy up cvs entries

I've not had time to take care of wi lately...

Remove myself as maintainer of the OSF/1 compat code. I haven't had
an alpha booting -current since my xp1000 died over a year ago, and I
don't think I touched the osf1 code since long before then.

Explain what's so special about share/mk, and be even more friendly.

Revise my status slightly for the bits that I am concerned with.

Document the previously existing RELENG_[45]_* security branch locks.

Approved by: core (quite a while ago)

Add a 'statement of intent' blurb to the top of MAINTAINERS. Split
the role of MAINTAINERS into advisory and strict parts. Introduce a
new LOCKS file to document enforced locked parts of the tree.

Strict locks are only added with core approval and will generally
have a renewal timeout.

Clarify that the source tree is a community effort, not a place to stake
out 'turf'.

This will be refined as needed.

With-core-hat-on: Yes

Reassert some maintainership. People aren't using good judgment.

Looking just at Makefiles was slightly too narrow to catch all
"inofficial" declarations of maintainership. Grep all plain files,
and insert the actual command the list was generated with, so
future updates avoid that pitfall.

Removed sheldonh@ who just released his maintainership of ntp/doc
after I informed him of this effort.

Update (reduce) the list of committers with MAINTAINER= lines in Makefiles.

Put myself on behalf of portmgr as maintainer of pkg_install tools.

Add myself as a maintainer of geom_shsec.

Drop hold on patch. ENOTIME for long-stalled ideas here. Too busy elsewhere.
Add lines for interest in 'ps' and 'pkill', where I'm more active.

add myself as the contact for the pkg_install tools

Remove vinum from the list. I no longer have the time and energy to
even review changes.

Add myself as geom_raid3 maintainer.

Fix spelling.

Pointed out by: mux, ru

Be a bit nicer for those who want to work on my code.

Dedicated to: mux, bosko

Add myself as a maintainer of geom_mirror.

s/manditory/mandatory

Obtained from: Ceri Davies

Explain that for nfs, rpc.lockd and truss I am just noting that I _can_
and would like to review changes if desired.

Maintain my strict lock on libc/rpc.

Request that diffs against nfs, rpc and rpc.lockd are run by me.

Introduce GEOM_LABEL class.
This class is used for detecting volume labels on file systems:
UFS, MSDOSFS (FAT12, FAT16, FAT32) and ISO9660.
It also provide native labelization (there is no need for file system).

g_label_ufs.c is based on geom_vol_ffs from Gordon Tetlow.
g_label_msdos.c and g_label_iso9660.c are probably hacks, I just found
where volume labels are stored and I use those offsets here,
but with this class it should be easy to do it as it should be done by
someone who know how.
Implementing volume labels detection for other file systems also should
be trivial.

New providers are created in those directories:
/dev/ufs/ (UFS1, UFS2)
/dev/msdosfs/ (FAT12, FAT16, FAT32)
/dev/iso9660/ (ISO9660)
/dev/label/ (native labels, configured with glabel(8))

Manual page cleanups and some comments inside were submitted by
Simon L. Nielsen, who was, as always, very helpful. Thanks!

Add myself as maintainer for geom_nop, geom_stripe and geom(8).

Remove myself from da(4). MIHIRA Sanpei Yoshiro will be taking over quirk
maintenance given his work on USB. Also, the root cause of spamming da(4)
with NO_6_BYTE quirks was fixed last year and the extraneous quirks have
been removed. Please coordinate future quirk issues with sanpei@

Add myself as maintainer for geom_concat and geom_gate.

Adding Tony Ackerman (tackerman) as the maintainer for the em(4) Intel Gigabit Ethernet driver.

Suspend my interest in maintaining libalias(3) and natd(8).

Adding Vinod Kashyap (vkashyap) as the maintainer for twa.

Remove these MAINTAINER lines since the maintainers has had their
commit bits retired for safe keeping.

Remove raidframe from the list

Add myself as maintainer for contrib/pf

Approved by: bms(mentor)

Update for reality.

Adding Vinod Kashyap (vkashyap) as the maintainer for twe.

Add somemore items to the list. The purpose is not to extert control over
these, but to let people know that they are maintained.

I'll continue to babysit the Kerberos-related stuff.

Add an entry for RELENG_5_* to match the RELENG_4_* entry.

Reviewed by: nectar
Approved by: rwatson (mentor)
Bikesheds to: nectar

I'll maintain dhclient from now on.

Ok'd by: murray

Release contrib/smbfs from the import-only mode. Now changes can be committed
directly without import process. The same about MFCs.

Put a note about nwfs.

Discussed with: peter

Adjust for new telnet situation (single telnet source tree).

Move my inetd maintainer note to src/MAINTAINERS.

Remove MAINTAINER= lines from individual Makefiles in favor of the
MAINTAINER file (which already had entries for sendmail).

Also remove the ones that snuck in at the bottom.

Update and try to remain out of area where conflict exists.

Remove MAINTAINER= lines in the makefiles for camcontrol, iostat, libcam
and libdevstat, since the new way of doing things is to just list
maintainership in src/MAINTAINERS.

Also, remove duplicate entries in src/MAINTAINERS for those utilities. I
already had entries for them.

Remove duplicate lines for 'lpr' (copied from lpr/Makefile).
Add myself as low-key maintainer for newsyslog.

Drop maintainership of whois(1). If someone needs a review they can
find me in the whois.c revision history.

Clarify the telnet requirements slightly, and state an area-of-interest
in the crypto source. This is not a lock.

Move my maintainership of parts of ipfilter back to Darren Reed

Follow the trend of moving MAINTAINER lines from Makefile into
src/MAINTAINERS.

Remove this maintainer bit. Another version will be added a
bit later.

Drop stale maintainer bits.

Move unifdef to the original section of the file.

Copy the (normalized) MAINTAINER= entries from Makefile's and other sources,
and suggest consolidating them into this file instead.

OBE

I'd like to keep an eye on nsdispatch and friends for a while.

Nuke xargs, I haven't had to help anyone with it, so I assume it stands on
its own just fine. Nuke request for heads-up on libufs, most of my work on
it these days is gradual, and mention that I'm willing to help with work in
it, so that others can feel free to make it suck less, and get feedback from
me in a purely "I understand this crud" sort of way.

Now that the need for "landgrabs" in this file is no longer present,
I release "my" bits of code, trusting the remaining committers to
be a sensible lot who will do the right thing.

Deregister etc/rc.* commit request notification. mtm is doing a better job
at it than I am.

Remove request for i386 boot[012] review. I didn't have time recently to
work on the UFS2 stuff and people were committing patches w/o sending them
my way anyways, so it seems rather pointless for me to be in here. :)

Note file, one-true-awk, lukemftpd.

A number of people objected to make(1) being treated specially.

Approved by: re

Remove my 'pre-commit' on sa(4).

Lay claim to mpt for requesting pre-commit review.

Add a MAINTAINERS entry for make(1), to the make@ alias, which anyone can use
to run patches to make(1) by. Hopefully this will make it easier to get bugs
fixed in make(1), as well as get review by people with experience working on,
in, around, etc., make(1).

Currently it points to two people who have demonstrated maintainership (ru@
and myself) and one person interested in helping (alane@). That list is
subject to expansion and contraction.

Clarify my feelings towards fetch / libfetch.

Add myself as da(4) maintainer. This is mostly so I can review and commit
quirks.

Point at myself for reviews on commits to the MAC Framework and
MAC modules.

Added groff(1) and natd(8) entries.

Express my interest about being notified for fdc(4) and sppp(4) changes.

This file is getting unparseable. IMHO we should at least sort it by
maintainer, or even better by subsystem. Opinions?

Add my interest in etc/rc.* to help keep etc/rc.d in sync as much as possible.

Simplify isp(4) line; add sa(4) for pre-commit review. Remove myself from
CAM review list.

Register an interest in pseudofs, procfs and linprocfs.

Add libufs, a library for dealing with UFS filesystems from userland to
the build. It is here to compartmentalise functionality currently duplicated
in many notable programs in the base system. It currently handles block
reads and writes, as well as reading and writing of the filesystem superblock,
and the reading/lookup of inode data. It supports both UFS and UFS2. I
will be maintaining it, and porting programs to use it, however for now, it
is simply being built as part of world.

Add a module for src/tools/regression (`regression').

Add a MAINTAINERS line for the regression module, specifically referring to
src/tools/regression/usr.bin, right now, but applicable to other things, to
make clear that I am willing to help write new tests. The framework is all
modularised now, so it is easy to write new tests, etc., and since I'd like
to see tests for more and more things as bugs get fixed, it seems to be the
right thing to do to stand up and offer to help people write tests.

I hope I won't regret this too much.

Resign my maintainership of OpenSSH.

It seems the hard lock on m4(1) is viewed as superfluous. Okay. It's gone.

I'm sick of waiting on OpenBSD to make a number of changes anyway. If someone
else wants to take over fixing m4(1), I'll be glad to make them aware of the
existing issues.

That's right, you can shove your xargs(1) issues in my direction, and I'm
also glad to review changes to it.

Fill in my MAINTAINER info for drm

Approved by: des

I'm keeping an eye on xten

indent tdfx line similarly to rest of the file

note that freebsd-ipfw@freebsd.org should be sent patches before making
changes to ipfw.

Keep people from introducing local changes I do not know about to m4 for the
time being, until OpenBSD's -s support is finished being fixed, so I have a
chance in hell of getting one last clean merge against OpenBSD.

Use more common phrasing for the "request reviews" text. Add UFS EAs,
POSIX.1e ACLs to the list of things I like to review changes for.

Drop perl5 hard lock as perl5 is now gone.

Document my willingness in maintaining share/mk infrastructure.

Do as you want with GCC.

Add a couple of entries. My MAINTAINER= lines are not locks.

Add entry for Vinum.

Place a hard lock on base-perl until it is deleted.

Add lines for lpr and patch.

I have no idea how I managed to get two lines about geom in there...

Grmf. I really didn't want to do this, but it seems to be the only way
to keep people honest.

Drop myself from an entry I was unexpectedly included in.

Add me to the MAINTAINERS for 3dfx card stuff.

Align for one true tab size of 8 in revision 1.2.

I decided I don't want to be part of this.

Add a reminder that commits to the security branches must go through the
Security Officer.

Require approval for DHCP commits. I have commit access to isc.org
DHCP, so it should not be too much to ask to keep the sources synced.

Note that CAM changes should be sent to scsi@freebsd.org.

Add isp(4)- but note that the FreeBSD specific files (isp_freebsd.?,
isp_pci.c) just need a headsup. The other files are common with five
other platforms and changes need to be coordinated.

Go with the flow. Add sparc64.

Add my little piece of the world.
I guess nobody planned on 8 letter usernames.

Minor regularization of 'pre-commit review requested'

Note my areas of interest.

List that I'd like pre-commit review on PowerPC changes.

Note my areas of interest

Update my preferred way of handling ATA related stuff.

Try to express (in 15 char or less) the areas of kernel infrastructure
where I pretend to know what happens.

Specify my personal desired level of review for commits to several portions
of the i386 bootstrap code and witness.

Document the degree of maintainership that I am prepared to assume for
perl and telnet.

Review opportunity preferred for changes to libc/posix1e.

Add my level of stuff preference to MAINTAINERS

Use the one true tab size of 8, to match style(9)

Implement dougb's excellent suggestion, and satisfy one desire of ru.