]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/log
FreeBSD/stable/10.git
8 years agoMFC r285642
vangyzen [Tue, 21 Jul 2015 14:36:33 +0000 (14:36 +0000)]
MFC r285642

ssh: canonicize the host name before looking it up in the host file

Re-apply r99054 by des in 2002. This was accidentally dropped
by the update to OpenSSH 6.5p1 (r261320).

This change is actually taken from r387082 of
ports/security/openssh-portable/files/patch-ssh.c

Differential Revision: https://reviews.freebsd.org/D3103
PR: 198043
Approved by: re (gjb), kib (mentor)
Sponsored by: Dell Inc.
Relnotes: yes

git-svn-id: svn://svn.freebsd.org/base/stable/10@285750 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285529
brueffer [Tue, 21 Jul 2015 14:27:36 +0000 (14:27 +0000)]
MFC: r285529

If ggated's exports_find() fails, the connection is removed before
(trying to) report the problem to the client.

sendfail() is called with an already closed socket and thus it
fails to inform the client about the problem.

Fix this by calling sendfail() before connection_remove().

PR: 195944
Submitted by: Fabian Keil
Reviewed by: pjd
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285749 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285531
brueffer [Tue, 21 Jul 2015 14:25:21 +0000 (14:25 +0000)]
MFC: r285531

Unbreak ggatec and ggatel on i386 after r238119, which added two more
'struct g_gate_ctl_create' fields.

While the behaviour was technically undefined on other architectures
as well, on the reporter's amd64 systems the uninitialized bytes the
kernel cares about were always zero so everything worked as expected.

PR: 197309, 199559
Submitted by: ota@j.email.ne.jp, Fabian Keil
Reviewed by: pjd
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285748 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r284296
royger [Tue, 21 Jul 2015 07:22:18 +0000 (07:22 +0000)]
MFC: r284296

xen-blk{front/back}: remove broken FreeBSD extensions

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285738 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285089
royger [Tue, 21 Jul 2015 07:20:02 +0000 (07:20 +0000)]
MFC: r285089

netfront: preserve configuration across migrations

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285737 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoFix a typo in r285668. Replace hw.ixgbe.* with correct hw.ix.* for a couple of
hiren [Tue, 21 Jul 2015 00:31:13 +0000 (00:31 +0000)]
Fix a typo in r285668. Replace hw.ixgbe.* with correct hw.ix.* for a couple of
sysctls.

Approved by: re (gjb)
Sponsored by: Limelight Networks

git-svn-id: svn://svn.freebsd.org/base/stable/10@285731 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r277949:
allanjude [Mon, 20 Jul 2015 22:14:55 +0000 (22:14 +0000)]
MFC: r277949:
New function smbios_match to detect BIOS versions during boot

MFC: r277957:
Fix order of functions in smbios.c (corrects r277949)

MFC: r281138:
SMBIOS support for EFI

r281138 makes changes to the new unified EFI loader (r280950), which has not been merged to stable/10 (and likely won't be).
These changes were manually applied to the amd64 EFI loader (sys/boot/amd64/efi).
The changes to sys/boot/amd64/efi are a direct commit.

Reviewed by: stas
Approved by: re (gjb), marcel
Sponsored by: ScaleEngine Inc.
Differential Revision: https://reviews.freebsd.org/D3129

git-svn-id: svn://svn.freebsd.org/base/stable/10@285726 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r285253 (hrs):
gjb [Mon, 20 Jul 2015 21:52:05 +0000 (21:52 +0000)]
MFC r285253 (hrs):
 - Add IPv6 support in quota(1).  While rpc.rquotad has supported
   PF_INET6 for a long time, quota(1) utility supported only PF_INET.
 - Clean up confusing changes in f_mntfromname.
 - Add an entry for rquotad with rpc/udp6 to inetd.conf.

PR: 194084
Approved by: re (kib)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/stable/10@285725 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285482
allanjude [Mon, 20 Jul 2015 16:17:43 +0000 (16:17 +0000)]
MFC: r285482
A variable was misspelled resulting in chmod executing on the installer instead of on the target chroot

PR: 191402

MFC: r285553
make /var/audit its own dataset so it is not part of the OS boot environment

PR: 199864

MFC: r285554
Set a mountpoint on the root of the pool so user-created datasets have a mountpoint to inherit

MFC: r285557
Make bsdinstall's zfsboot script align partitions to 4k/1m when the user requests it

PR: 195174

Approved by: re (gjb), brueffer
Relnotes: yes
Sponsored by: ScaleEngine Inc.

git-svn-id: svn://svn.freebsd.org/base/stable/10@285721 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285457
brueffer [Mon, 20 Jul 2015 14:40:34 +0000 (14:40 +0000)]
MFC: r285457

Don't claim c99 is a wrapper around gcc; it's a wrapper around the system
cc.

PR:             201303
Submitted by:   Bruce Cran
Approved by:    re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285718 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC 278040:
jpaetzel [Mon, 20 Jul 2015 14:38:40 +0000 (14:38 +0000)]
MFC 278040:

Prevent inlining txg_quiesce

This allows dtrace to monitor the calls to txg_quiesce which can be
really helpful.

Also standardize __noinline order for arc_kmem_reap_now.

Sponsored by: Multiplay

Approved by: re

git-svn-id: svn://svn.freebsd.org/base/stable/10@285717 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoLoader tunable fetching has been broken on stable/10 since ix(4) rewrite
hiren [Sat, 18 Jul 2015 04:49:36 +0000 (04:49 +0000)]
Loader tunable fetching has been broken on stable/10 since ix(4) rewrite
introduced by r280182. FreeBSD-head doesn't need TUNABLE_INT() now with
SYSCTL_INT() but stable/10 still does.
Note: This is a direct commit to stable/10.

PR: 201644
Reviewed by: erj
Approved by: re (gjb)
Sponsored by: Limelight Networks

git-svn-id: svn://svn.freebsd.org/base/stable/10@285668 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r285275 (only the part that fixes PR 199568):
pkelsey [Sat, 18 Jul 2015 01:29:27 +0000 (01:29 +0000)]
MFC r285275 (only the part that fixes PR 199568):

Obtain proper capsicum rights for dump files so rotation of such files works when requested.  This is equivalent to cherry picking the following upstream commits:

commit c6d472bf63488b0c2ab7ab9f4b32c68dd2c8ea2b
commit f08eb851eedf9775e6485ab75c0d8cf8d1306be6
commit d83a284abc80d3d09f6bddd087760bb1b01d9cc7

PR:  199568
Approved by: re

git-svn-id: svn://svn.freebsd.org/base/stable/10@285665 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoUpdate stable/10 to BETA2 in preparation for 10.2-BETA2 builds.
gjb [Fri, 17 Jul 2015 00:00:04 +0000 (00:00 +0000)]
Update stable/10 to BETA2 in preparation for 10.2-BETA2 builds.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285646 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r284207 (by alc):
kib [Thu, 16 Jul 2015 15:13:17 +0000 (15:13 +0000)]
MFC r284207 (by alc):
Correct a type error in kmem_unback().

Requested by: alc
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285635 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r276439 (by alc):
kib [Thu, 16 Jul 2015 14:41:58 +0000 (14:41 +0000)]
MFC r276439 (by alc):
Make the creation of the free lists dynamic, i.e., it is based on the
available physical memory at boot time. For amd64 systems with 64 GB
or more of physical memory, create free lists for managing pages with
physical addresses below 4 GB.

PR: 185727
Requested by: alc
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285634 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r285204:
ae [Wed, 15 Jul 2015 21:09:38 +0000 (21:09 +0000)]
MFC r285204:
  Fill the port and protocol information in the SADB_ACQUIRE message
  in case when security policy has it as required by RFC 2367.

  PR: 192774

Approved by: re (delphij)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285614 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r285612, MFC of ntp 4.2.8p3.
delphij [Wed, 15 Jul 2015 19:38:14 +0000 (19:38 +0000)]
Document r285612, MFC of ntp 4.2.8p3.

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285613 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r280849,280915-280916,281015-281016,282097,282408,282415,283542,
delphij [Wed, 15 Jul 2015 19:21:26 +0000 (19:21 +0000)]
MFC r280849,280915-280916,281015-281016,282097,282408,282415,283542,
     284864,285169-285170,285435:

ntp 4.2.8p3.

Relnotes: yes
Approved by: re (?)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285612 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r285424 (ian):
delphij [Wed, 15 Jul 2015 19:11:43 +0000 (19:11 +0000)]
MFC r285424 (ian):

Use the monotonic (uptime) counter rather than time-of-day to measure
elapsed time between ntp_adjtime() clock offset adjustments.  This
eliminates spurious frequency steering after a large clock step (such
as a 1970->2015 step on a system with no battery-backed clock hardware).

This problem was discovered after the import of ntpd 4.2.8, which does
things in a slightly different (but still correct) order than the 4.2.4
we had previously.  In particular, 4.2.4 would step the clock then
immediately after use ntp_adjtime() to set the frequency and offset to
zero, which captured the post-step time-of-day as a side effect.  In
4.2.8, ntpd sets frequency and offset to zero before any initial clock
step, capturing the time as 1970-ish, then when it next calls
ntp_adjtime() it's with a non-zero offset measurement. This non-zero
value gets multiplied by the apparent 45-year interval, which blows up
into a completely bogus frequency steer.  That gets clamped to 500ppm,
but that's still enough to make the clock drift so fast that ntpd has
to keep stepping it every few minutes to compensate.

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285611 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r285427:
gjb [Wed, 15 Jul 2015 18:18:07 +0000 (18:18 +0000)]
MFC r285427:
 Do not mount /var/log and /var/tmp as md(4)-backed devices.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285609 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r261495 by ed
brueffer [Wed, 15 Jul 2015 17:43:13 +0000 (17:43 +0000)]
MFC: r261495 by ed

Use right buffer to print to.

PR: kern/176597
Submitted by: Christoph Mallon <christoph mallon gmx de>
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285608 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r285190:
pkelsey [Wed, 15 Jul 2015 16:57:40 +0000 (16:57 +0000)]
MFC r285190:

Fix if_loop so bpfwrite() can use it regardless of the state of
bd_hdrcmplt.  As if_loop does not use link-level headers, its behavior
when used by bpfwrite() should be the same regardless of the state of
bd_hdrcmplt.  Without this change, libpcap (and other BPF users that
work like it) fail when writing to loopback interfaces.

Approved by: re

git-svn-id: svn://svn.freebsd.org/base/stable/10@285605 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r285188:
pkelsey [Wed, 15 Jul 2015 16:55:56 +0000 (16:55 +0000)]
MFC r285188:

Fix sysctl(3) so it returns the intended values for all mib names in
the 'user' sysctl tree, which have all been coming back 0 or empty
since r240176.

Approved by: re

git-svn-id: svn://svn.freebsd.org/base/stable/10@285604 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r277218, r277219, r280572, r280573, r280574
brueffer [Wed, 15 Jul 2015 16:47:13 +0000 (16:47 +0000)]
MFC: r277218, r277219, r280572, r280573, r280574

Add manpages for the ixl and ixlv drivers.

PR: 194313
Approved by: re (marius)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285603 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285006
brueffer [Wed, 15 Jul 2015 11:58:30 +0000 (11:58 +0000)]
MFC: r285006

Use the correct le*dec function to decode a 16bit type.

PR: 194228
Submitted by: David Horwitt
Approved by: re (marius)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285599 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoRemove the r283505 entry for now, pending refinement based
gjb [Tue, 14 Jul 2015 23:41:19 +0000 (23:41 +0000)]
Remove the r283505 entry for now, pending refinement based
on feedback from andrew@ and ian@.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285588 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284096, dtb module for AM335x systems
gjb [Tue, 14 Jul 2015 21:46:12 +0000 (21:46 +0000)]
Document r284096, dtb module for AM335x systems

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285586 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284094, rpi.dtb module and installation default.
gjb [Tue, 14 Jul 2015 21:46:09 +0000 (21:46 +0000)]
Document r284094, rpi.dtb module and installation default.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285585 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284555, sfxge(4) 7XXX-series NIC support.
gjb [Tue, 14 Jul 2015 21:46:06 +0000 (21:46 +0000)]
Document r284555, sfxge(4) 7XXX-series NIC support.
Add Solarflare Communications to sponsors.ent.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285584 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r282826, SIFTR kernel configuration option.
gjb [Tue, 14 Jul 2015 21:46:03 +0000 (21:46 +0000)]
Document r282826, SIFTR kernel configuration option.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285583 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r282065, PAE_TABLES option.
gjb [Tue, 14 Jul 2015 21:46:00 +0000 (21:46 +0000)]
Document r282065, PAE_TABLES option.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285582 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r275249, timeo, actimeo, noac, proto mount_nfs(8) options.
gjb [Tue, 14 Jul 2015 21:45:58 +0000 (21:45 +0000)]
Document r275249, timeo, actimeo, noac, proto mount_nfs(8) options.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285581 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoReword the r283505 entry.
gjb [Tue, 14 Jul 2015 20:10:41 +0000 (20:10 +0000)]
Reword the r283505 entry.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285572 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r281323, bzipfs support in EFI loader.
gjb [Tue, 14 Jul 2015 20:10:39 +0000 (20:10 +0000)]
Document r281323, bzipfs support in EFI loader.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285571 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r283505, relocatable kernel and ubldr.
gjb [Tue, 14 Jul 2015 20:10:36 +0000 (20:10 +0000)]
Document r283505, relocatable kernel and ubldr.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285570 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r283500: Toradex Apalis support, and AUDMUX, SDMA, and
gjb [Tue, 14 Jul 2015 20:10:34 +0000 (20:10 +0000)]
Document r283500: Toradex Apalis support, and AUDMUX, SDMA, and
SSI support.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285569 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r278599, support for Exynos 5420 and SMP enabled
gjb [Tue, 14 Jul 2015 20:10:31 +0000 (20:10 +0000)]
Document r278599, support for Exynos 5420 and SMP enabled
by default.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285568 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r278079, support to poweroff the BeagleBone Black via
gjb [Tue, 14 Jul 2015 20:10:29 +0000 (20:10 +0000)]
Document r278079, support to poweroff the BeagleBone Black via
shutdown(8) and poweroff(8) added.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285567 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoFix another typo. Sigh.
gjb [Tue, 14 Jul 2015 17:01:55 +0000 (17:01 +0000)]
Fix another typo.  Sigh.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285547 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284499, cdce(4) support for RTL8153 chipset.
gjb [Tue, 14 Jul 2015 16:57:14 +0000 (16:57 +0000)]
Document r284499, cdce(4) support for RTL8153 chipset.

Submitted by: Ben Woods
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/stable/10@285546 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoFix typo.
gjb [Tue, 14 Jul 2015 15:38:45 +0000 (15:38 +0000)]
Fix typo.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285544 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285414, r285440, r285441, r285443
bapt [Tue, 14 Jul 2015 12:21:47 +0000 (12:21 +0000)]
MFC: r285414, r285440, r285441, r285443

- allow to create users with uid 0
- fix check duplicates logic
- fix gid policy to be in sync with uid if possible

Reported by: Jan Mikkelsen <janm@transactionware.com>
Approved by: re (marius)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285536 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285037
brueffer [Tue, 14 Jul 2015 11:37:26 +0000 (11:37 +0000)]
MFC: r285037

Add -b to the devlist usage info, forgotten in r260059.

PR: 195094
Submitted by: robin.hahling@gw-computing.net
Approved by: re (marius)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285532 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r281708, psm(4) enhancements.
gjb [Tue, 14 Jul 2015 01:32:25 +0000 (01:32 +0000)]
Document r281708, psm(4) enhancements.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285521 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r276686, reaper facility.
gjb [Tue, 14 Jul 2015 01:32:23 +0000 (01:32 +0000)]
Document r276686, reaper facility.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285520 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284018, fix for panic when destroying vnet jail with
gjb [Tue, 14 Jul 2015 01:32:20 +0000 (01:32 +0000)]
Document r284018, fix for panic when destroying vnet jail with
gre(4).

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285519 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r276068, fix for panic when destroying vnet jail with
gjb [Tue, 14 Jul 2015 01:32:18 +0000 (01:32 +0000)]
Document r276068, fix for panic when destroying vnet jail with
gif(4).

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285518 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r275807, compat.linux.osrelease updated after
gjb [Mon, 13 Jul 2015 20:07:36 +0000 (20:07 +0000)]
Document r275807, compat.linux.osrelease updated after
support for CentOS 6 ports has been added.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285509 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r274486, pfil(9) default hash change.
gjb [Mon, 13 Jul 2015 20:07:34 +0000 (20:07 +0000)]
Document r274486, pfil(9) default hash change.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285508 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r279157, ral(4) support for Ralink RT5390 and RT5392
gjb [Mon, 13 Jul 2015 20:07:32 +0000 (20:07 +0000)]
Document r279157, ral(4) support for Ralink RT5390 and RT5392
chipsets.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285507 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r283076, nvd(4) and nvme(4) included in GENERIC.
gjb [Mon, 13 Jul 2015 20:07:29 +0000 (20:07 +0000)]
Document r283076, nvd(4) and nvme(4) included in GENERIC.
Add Intel to sponsors.ent (note, &intel; cannot be used here).

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285506 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r276403, bhyve support for AMD processors with SVM/AMD-V.
gjb [Mon, 13 Jul 2015 20:07:26 +0000 (20:07 +0000)]
Document r276403, bhyve support for AMD processors with SVM/AMD-V.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285505 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r275273, virtio_console(4) addition.
gjb [Mon, 13 Jul 2015 20:07:24 +0000 (20:07 +0000)]
Document r275273, virtio_console(4) addition.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285504 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoSort by svn revision.
gjb [Mon, 13 Jul 2015 18:54:10 +0000 (18:54 +0000)]
Sort by svn revision.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285499 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoReword previous mkimg(1) update.
gjb [Mon, 13 Jul 2015 18:54:08 +0000 (18:54 +0000)]
Reword previous mkimg(1) update.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285498 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284523, mkimg(1) '-c' option.
gjb [Mon, 13 Jul 2015 18:54:06 +0000 (18:54 +0000)]
Document r284523, mkimg(1) '-c' option.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285497 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r278968, EFI support added to mkimg(1).
gjb [Mon, 13 Jul 2015 18:54:03 +0000 (18:54 +0000)]
Document r278968, EFI support added to mkimg(1).

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285496 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284365, vxlan(4) addition.
gjb [Mon, 13 Jul 2015 18:54:01 +0000 (18:54 +0000)]
Document r284365, vxlan(4) addition.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285495 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284066, gre(4) overhaul.
gjb [Mon, 13 Jul 2015 18:53:58 +0000 (18:53 +0000)]
Document r284066, gre(4) overhaul.
Add Yandex LLC to sponsors.ent.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285494 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r282861, apple-boot, apple-hfs, apple-ufs support in gpart(8).
gjb [Mon, 13 Jul 2015 18:53:55 +0000 (18:53 +0000)]
Document r282861, apple-boot, apple-hfs, apple-ufs support in gpart(8).

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285493 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r283548, mkimg(1) now used for i386 memstick images.
gjb [Mon, 13 Jul 2015 15:46:01 +0000 (15:46 +0000)]
Document r283548, mkimg(1) now used for i386 memstick images.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285480 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r277520, 510.status-world-kernel addition.
gjb [Mon, 13 Jul 2015 15:45:58 +0000 (15:45 +0000)]
Document r277520, 510.status-world-kernel addition.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285479 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r283161, native FreeBSD/arm build support in release tools.
gjb [Mon, 13 Jul 2015 15:45:56 +0000 (15:45 +0000)]
Document r283161, native FreeBSD/arm build support in release tools.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285478 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r283972, 3wire ttys class.
gjb [Mon, 13 Jul 2015 15:45:54 +0000 (15:45 +0000)]
Document r283972, 3wire ttys class.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285477 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284009, growfs rc(8) script addition.
gjb [Mon, 13 Jul 2015 15:45:51 +0000 (15:45 +0000)]
Document r284009, growfs rc(8) script addition.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285476 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284775, ttyu{1,2,3} enabled by default on arm.
gjb [Mon, 13 Jul 2015 15:45:49 +0000 (15:45 +0000)]
Document r284775, ttyu{1,2,3} enabled by default on arm.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285475 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r283270, nc(1) update to OpenBSD 5.7's version.
gjb [Mon, 13 Jul 2015 15:45:46 +0000 (15:45 +0000)]
Document r283270, nc(1) update to OpenBSD 5.7's version.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285474 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r284398, tzdata update to 2015e.
gjb [Mon, 13 Jul 2015 15:45:44 +0000 (15:45 +0000)]
Document r284398, tzdata update to 2015e.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285473 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r283258, date(1) '-r' compatibility with the GNU version.
gjb [Mon, 13 Jul 2015 15:45:42 +0000 (15:45 +0000)]
Document r283258, date(1) '-r' compatibility with the GNU version.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285472 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285028
brueffer [Mon, 13 Jul 2015 13:42:05 +0000 (13:42 +0000)]
MFC: r285028

Add the year to the VAX-11/780 announcement entry.

PR: 200961
Submitted by: John Marshall
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285455 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r284290, r284323
brueffer [Mon, 13 Jul 2015 13:14:51 +0000 (13:14 +0000)]
MFC: r284290, r284323

Improve grammar.

PR: 200673
Submitted by: Fabian Keil
Obtained from: ElectroBSD
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285454 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285029
brueffer [Mon, 13 Jul 2015 13:02:04 +0000 (13:02 +0000)]
MFC: r285029

Fix an obviously wrong boolean operator.

PR: 200983
Submitted by: David Bindeman
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285453 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r284930
brueffer [Mon, 13 Jul 2015 12:28:18 +0000 (12:28 +0000)]
MFC: r284930

Add CouchDB ports (5984 TCP/UDP).

PR: 193268
Submitted by: yuri@rawbw.com
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285451 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285010
brueffer [Mon, 13 Jul 2015 12:19:01 +0000 (12:19 +0000)]
MFC: r285010

Add one more file missed in the BIND-removal entries.

PR: 196515
Submitted by: Trond Endrestol
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285450 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r284929
brueffer [Mon, 13 Jul 2015 12:04:40 +0000 (12:04 +0000)]
MFC: r284929

Fix issues that kept some of the examples from actually working.

PR: 144534
Submitted by: Nicolas Edel
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285448 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r284931
brueffer [Mon, 13 Jul 2015 11:58:08 +0000 (11:58 +0000)]
MFC: r284931

Set the initial system time to a sane (as in: not end of 21st century)
value when booting on a PC with CMOS clock set to a year before 2000.

This uses 1980 (instead of 1970 as in the initial patch) as pivot year as
suggested by imp in the PR followup.

PR: 195703
Submitted by: cs@soi.spb.ru
Reviewed by: imp
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285446 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r285088:
hselasky [Sat, 11 Jul 2015 21:59:15 +0000 (21:59 +0000)]
MFC r285088:
Fix broken implementation of "kvasprintf()" function by adding missing
kmalloc() call. Make function global instead of static inline to fix
compiler warnings about passing variable argument lists to inline
functions.

Sponsored by:   Mellanox Technologies
Approved by: re, gjb

git-svn-id: svn://svn.freebsd.org/base/stable/10@285410 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r284887:
kib [Sat, 11 Jul 2015 19:11:40 +0000 (19:11 +0000)]
MFC r284887:
Handle errors from background write of the cylinder group blocks.

MFC r284927:
Simplify code.

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285402 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoFix two remaining issues with the arm UFS mount issue:
gjb [Fri, 10 Jul 2015 22:10:00 +0000 (22:10 +0000)]
Fix two remaining issues with the arm UFS mount issue:

- Add the GEOM_PART_GPT option and enable MSDOSFS in the GUMSTIX
  kernel. [1]

- Add GEOM_LABEL to the PANDABOARD kernel, that should have been
  included included in r285132.  I confused the kernel configuration
  used for the WANDBOARD and PANDABOARD, which the former uses the
  IMX6 kernel configuration, along with the CUBOX-HUMMINGBOARD.

This is a direct commit to stable/10, as was r285132.

[1] I do not actually have the GUMSTIX board, but I suspect it will
    fail to boot in the same way as the others have been.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285365 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoUpdate stable/10 to BETA1 in preparation for 10.2-BETA1 builds.
gjb [Fri, 10 Jul 2015 00:01:33 +0000 (00:01 +0000)]
Update stable/10 to BETA1 in preparation for 10.2-BETA1 builds.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285346 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoRemove duplicate file(1) update entry.
gjb [Thu, 9 Jul 2015 22:44:28 +0000 (22:44 +0000)]
Remove duplicate file(1) update entry.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285341 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument SA-15:12.
gjb [Thu, 9 Jul 2015 17:45:08 +0000 (17:45 +0000)]
Document SA-15:12.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285335 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r285330, OpenSSL update to 1.0.1p.
gjb [Thu, 9 Jul 2015 17:25:02 +0000 (17:25 +0000)]
Document r285330, OpenSSL update to 1.0.1p.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285333 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r285329
jkim [Thu, 9 Jul 2015 17:17:22 +0000 (17:17 +0000)]
MFC: r285329

Merge OpenSSL 1.0.1p.

Approved by: re (gjb)
Relnotes: yes

git-svn-id: svn://svn.freebsd.org/base/stable/10@285330 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r276383, r276400:
gjb [Thu, 9 Jul 2015 15:56:51 +0000 (15:56 +0000)]
MFC r276383, r276400:

 r276383:
  Delay dropping to the mountroot prompt for 10 seconds
  in case the root device is not yet ready.

 r276400:
  Use the correct loader.conf(5) entry for deferring the
  mountroot prompt.

Approved by: re (marius)
Reminded by: hrs
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/stable/10@285322 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFH (r275020): partial fix for getgrouplist() in group_compat case
des [Thu, 9 Jul 2015 13:30:37 +0000 (13:30 +0000)]
MFH (r275020): partial fix for getgrouplist() in group_compat case

PR: 190055
Approved by: re (marius)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285317 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r285305, sendmail update to 8.15.2.
gjb [Thu, 9 Jul 2015 05:46:37 +0000 (05:46 +0000)]
Document r285305, sendmail update to 8.15.2.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285306 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: Update for sendmail 8.15.2 import
gshapiro [Thu, 9 Jul 2015 05:27:30 +0000 (05:27 +0000)]
MFC: Update for sendmail 8.15.2 import

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285305 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: Minor changes to force commit these files so new freebsd*.cf files
gshapiro [Thu, 9 Jul 2015 05:25:47 +0000 (05:25 +0000)]
MFC: Minor changes to force commit these files so new freebsd*.cf files
     are built to use the new sendmail-8.15.2/cf tree.

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285304 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: Merge sendmail 8.15.2
gshapiro [Thu, 9 Jul 2015 05:23:17 +0000 (05:23 +0000)]
MFC: Merge sendmail 8.15.2

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285303 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: Temporarily disable WARNS while addressing a non-issue with the upstream code
gshapiro [Thu, 9 Jul 2015 05:02:13 +0000 (05:02 +0000)]
MFC: Temporarily disable WARNS while addressing a non-issue with the upstream code

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285302 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoBy default, sendmail 8.15 uses uncompressed IPv6 addresses. Keep
gshapiro [Thu, 9 Jul 2015 05:00:19 +0000 (05:00 +0000)]
By default, sendmail 8.15 uses uncompressed IPv6 addresses.  Keep
current FreeBSD 10 and earlier behavior of using compressed IPv6
addresses in configuration, maps, rulesets, etc.  (FreeBSD 11 and
later will use the new default of uncompressed IPv6 addresses.)

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285301 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: libsm/path.c is about to disappear in the merge of sendmail 8.15.2. It
gshapiro [Thu, 9 Jul 2015 04:58:56 +0000 (04:58 +0000)]
MFC: libsm/path.c is about to disappear in the merge of sendmail 8.15.2.  It
is an empty file now so it is safe to remove before the merge.

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285300 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r285138:
loos [Wed, 8 Jul 2015 23:50:04 +0000 (23:50 +0000)]
MFC r285138:

  Install loader.rc with ARM u-boot loader (ubldr).

  loader.rc is the responsible to read and process loader.conf variables.

  This fix the issue of loader.conf being silently ignored.

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285298 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC: r279597 (and 259152,259219 as dependency)
bapt [Wed, 8 Jul 2015 21:06:19 +0000 (21:06 +0000)]
MFC: r279597 (and 259152,259219 as dependency)

Make calendar(1) usable again. rework the calendar parser so that it is
compatible with documented format:

Support includes surrounded by '"' or '<' '>'
Print warnings about bad syntax
Correctly navigate through include directories to find calendar files
Correctly support multiple includes

While here:

MFC: 262011 (by eadler)

calendar(1): don't segfault in invalid input

When the user supplies an invalid number of days provide a useful error message
instead of segfaulting.

Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/stable/10@285291 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r285236, TSO and checksum offloading support in
gjb [Wed, 8 Jul 2015 12:08:58 +0000 (12:08 +0000)]
Document r285236, TSO and checksum offloading support in
hv_netvsc(4).

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285267 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r285206, unbound updated to 1.5.3.
gjb [Wed, 8 Jul 2015 12:08:55 +0000 (12:08 +0000)]
Document r285206, unbound updated to 1.5.3.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285266 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoDocument r285092, pw(8) '-R' option.
gjb [Wed, 8 Jul 2015 12:08:53 +0000 (12:08 +0000)]
Document r285092, pw(8) '-R' option.

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

git-svn-id: svn://svn.freebsd.org/base/stable/10@285265 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

8 years agoMFC r273489 (cperciva):
gjb [Wed, 8 Jul 2015 09:54:17 +0000 (09:54 +0000)]
MFC r273489 (cperciva):
 Populate the GELI passphrase cache with the kern.geom.eli.passphrase
 variable (if any) provided in the boot environment.  Unset it from
 the kernel environment after doing this, so that the passphrase is
 no longer present in kernel memory once we enter userland.

 This will make it possible to provide a GELI passphrase via the boot
 loader.

 Note: head and stable/10 differ as a result of r273174, which renames
 the getenv(), setenv(), and unsetenv() functions with kern_getenv(),
 kern_setenv(), and kern_unsetenv(), which was reverted in the relevant
 parts of this change in 10-STABLE.

PR: 200448
Approved by: re (kib)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/stable/10@285263 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f