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

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

With retirement of cpumask_t and usage of cpuset_t for representing a
mask of CPUs, pc_other_cpus and pc_cpumask become highly inefficient.

Remove them and replace their usage with custom pc_cpuid magic (as,
atm, pc_cpumask can be easilly represented by (1 << pc_cpuid) and
pc_other_cpus by (all_cpus & ~(1 << pc_cpuid))).

This change is not targeted for MFC because of struct pcpu members
removal and dependency by cpumask_t retirement.

MD review by: marcel, marius, alc
Tested by: pluknet
MD testing by: marcel, marius, gonzo, andreast

etire the cpumask_t type and replace it with cpuset_t usage.

This is intended to fix the bug where cpu mask objects are
capped to 32. MAXCPU, then, can now arbitrarely bumped to whatever
value. Anyway, as long as several structures in the kernel are
statically allocated and sized as MAXCPU, it is suggested to keep it
as low as possible for the time being.

Technical notes on this commit itself:
- More functions to handle with cpuset_t objects are introduced.
The most notable are cpusetobj_ffs() (which calculates a ffs(3)
for a cpuset_t object), cpusetobj_strprint() (which prepares a string
representing a cpuset_t object) and cpusetobj_strscan() (which
creates a valid cpuset_t starting from a string representation).
- pc_cpumask and pc_other_cpus are target to be removed soon.
With the moving from cpumask_t to cpuset_t they are now inefficient
and not really useful. Anyway, for the time being, please note that
access to pcpu datas is protected by sched_pin() in order to avoid
migrating the CPU while reading more than one (possible) word
- Please note that size of cpuset_t objects may differ between kernel
and userland. While this is not directly related to the patch itself,
it is good to understand that concept and possibly use the patch
as a reference on how to deal with cpuset_t objects in userland, when
accessing kernland members.
- KTR_CPUMASK is changed and now is represented through a string, to be
set as the example reported in NOTES.

Please additively note that no MAXCPU is bumped in this patch, but
private testing has been done until to MAXCPU=128 on a real 8x8x2(htt)
machine (amd64).

Please note that the FreeBSD version is not yet bumped because of
the upcoming pcpu changes. However, note that this patch is not
targeted for MFC.

People to thank for the time spent on this patch:
- sbruno, pluknet and Nicholas Esborn (nick AT desert DOT net) tested
several revision of the patches and really helped in improving
stability of this work.
- marius fixed several bugs in the sparc64 implementation and reviewed
patches related to ktr.
- jeff and jhb discussed the basic approach followed.
- kib and marcel made targeted review on some specific part of the
patch.
- marius, art, nwhitehorn and andreast reviewed MD specific part of
the patch.
- marius, andreast, gonzo, nwhitehorn and jceel tested MD specific
implementations of the patch.
- Other people have made contributions on other patches that have been
already committed and have been listed separately.

Companies that should be mentioned for having participated at several
degrees:
- Yahoo! for having offered the machines used for testing on big
count of CPUs.
- The FreeBSD Foundation for having sponsored my devsummit attendance,
which has been instrumental.
- Sandvine for having offered offices and infrastructure during
development.

(I really hope I didn't forget anyone, if it happened I apologize in
advance).

Merger of the quota64 project into head.

This joint work of Dag-Erling Smørgrav and myself updates the
FFS quota system to support both traditional 32-bit and new 64-bit
quotas (for those of you who want to put 2+Tb quotas on your users).

By default quotas are not compiled into the kernel. To include them
in your kernel configuration you need to specify:

options QUOTA # Enable FFS quotas

If you are already running with the current 32-bit quotas, they
should continue to work just as they have in the past. If you
wish to convert to using 64-bit quotas, use `quotacheck -c 64';
if you wish to revert from 64-bit quotas back to 32-bit quotas,
use `quotacheck -c 32'.

There is a new library of functions to simplify the use of the
quota system, do `man quotafile' for details. If your application
is currently using the quotactl(2), it is highly recommended that
you convert your application to use the quotafile interface.
Note that existing binaries will continue to work.

Special thanks to John Kozubik of rsync.net for getting me
interested in pursuing 64-bit quota support and for funding
part of my development time on this project.

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

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

Split the contributed code from libc/stdtime from lib/libc/stdtime
to contrib/tzcode/stdtime.

From contrib/tzcode:
The Makefiles are leftovers from the copies and should live in usr.sbin/zic/*

From usr.sbin/zic:
The sources are from a vendor contributed source, therefore should
live in contrib/tzcode/zic.

The last big commit: let usr.sbin/ use WARNS=6 by default.

MFV of tzdata2009t, r200831

zic:
- Fix URL / reference to Calendrical Calculations: Third Edition

libc/stdtime:
- Fix typo in tzfile.5 (no changes in our part)

MFC after: 1 week

MFV of r198828, tzcode2009q

- Cleanup unnecessary local variables in zdump.
- Fix man-page

MFC after: 1 week

MFV of r195794

MFV of tzcode2009k

zic.c:
Do not end a binary file with a POSIX-style time zone string
for locations that end up in permanent DST (thanks to Andreas
Schwab).

MFV of tzcode2009h revision r192887

- Clarify the license for the tzcode: public domain

MFC after: 1 month

MFV of tzcode2009e:

Upgrade of the tzcode from 2004a to 2009e.

Changes are numerous, but include...

- New format of the output of zic, which supports both 32 and 64
bit time_t formats.

- zdump on 64 bit platforms will actually produce some output instead
of doing nothing for a looooooooong time.

- linux_base-fX, with X >= at least 8, will work without problems related
to the local time again.

The original patch, based on the 2008e, has been running for a long
time on both my laptop and desktop machine and have been tested by
other people.

After the installation of this code and the running of zic(8), you
need to run tzsetup(8) again to install the new datafile.

Approved by: wollman@ for usr.sbin/zic
MFC after: 1 month

Finish a few more .Dl "quoted" arguments missed in revision 184984

Add missing quotes to .Dl arguments.

This is harmless for the mandoc output, but it makes syntax highlighting of
the .Dl argument string a bit prettier in Emacs.

Bootstrap the merge history to r183403.

getopt(3) returns -1, not EOF.

zic(8) should exit the loop when the end of the string is reached due
to the call to error(). The problem found by doing fuzz testing.

MFC after: 3 days

Normalize MAN.

Expand contractions.

Eliminate macro calls inside literal displays.

Make the -m option actually work.

Mechanically kill hard sentence breaks.

Merge changes from the tzcode2004a import.

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

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

style.Makefile(5)

Check whether setmode(3) fails and deallocate its return value after
calling getmode(3).

Approved by: wollman
MFC after: 1 week

The .Nm utility

Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.

Set wollman as the MAINTAINER and mention the vendor contact. Ideally
this entire subtree would be in src/contrib, but if that isn't going
to happen at least this has a chance of warning off unsuspecting
committers.

Approved by: wollman

Back out WARNS cleanup: this is apparently vendor code, even though
most of the files aren't on the vendor branch.

Submitted by: wollman

Constify, add some prototypes, and set WARNS=2.

Submitted by: Mike Barcroft <mike@q9media.com>

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

Set the default manual section for usr.sbin/ to 8.

Prepare for mdoc(7)NG.

mdoc(7) police: use canonical form of .Dd macro.

-Wall cleaning

mdoc(7) police: use the new features of the Nm macro.

Typo
Add FreeBSD Id

Spelling. Add missing .El.

$Id$ -> $FreeBSD$

Fix a bunch of broken cross-references

Add a prototype to silence warnings.

Fix mismerged error message.

Submitted by: charnier

I don't know how this happened since I know I compiled this on my machine.
Fix braino oflag -> uflag (or perhaps I should have gone the other way).

Merge changes from vendor branch (tzcode1999a), plus the following additional
changes:

- Finish migrating zic to its own private.h.
- Fix zic.8 so that it really is written in -mdoc.
- Add four new flags to zic (&document):
-D don't create directories
-u change ownership of newly-created files to user
-g change ownership of newly-created files to group
-m change mode of newly-created files to modespec
These, once proven, can be used to clean up the installation.

Obtained from: ftp://elsie.nci.nih.gov/pub/tzcode1999a.tar.gz (partially)

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

Remove two files replaced with HTML by vendor.

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

PR: docs/5986
Submitted by: MITSUNAGA Noriaki mitchy@er.ams.eng.osaka-u.ac.jp
Replace use of obsolete .q groff macro with .Dq

Convert to mdoc.

Use err(3). Rewrote man page using mdoc format.

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Remove old output file, if any, before creating the output file, in
case the file is a stale link.

Reviewed by: wollman

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Merge from vendor branch. We are now completely up-to-date with
respect to the ADO timezone code.

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

Convert "time zone" to "timezone" in NAME section

Submitted by: obrien@cs.ucdavis.edu (David E. O'Brien)

Another round of various man page cleanups.

Fix a variety of minor typos and cross references in a bunch of
man pages.

Masanobu Saitoh <msaitoh@spa.is.uec.ac.jp>
Giles Lean <giles@nemeton.com.au>
<soda@sra.co.jp>

Update timezone compiler and dumper to understand the new EC rules.

FreeBSD port of timezone code.

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