svn commit: r284334 - stable/10/sys/fs/nfsserver

Author: rmacklem Date: Fri Jun 12 22:05:04 2015 New Revision: 284334 URL: https://svnweb.freebsd.org/changeset/base/284334 Log: MFC: r283753 Make the NFS server use shared vnode locks for a few cases that are allowed by the VFS/VOP interface instead of using exclusive locks. Modified: s

svn commit: r284330 - in stable/10: crypto/openssl crypto/openssl/crypto crypto/openssl/crypto/hmac crypto/openssl/ssl secure/lib/libcrypto secure/lib/libcrypto/man secure/lib/libssl/man secure/usr...

Author: jkim Date: Fri Jun 12 17:10:19 2015 New Revision: 284330 URL: https://svnweb.freebsd.org/changeset/base/284330 Log: MFC: r284329 Merge OpenSSL 1.0.1o. Note it is instantly merged because it restores ABI compatibility broken by the previous OpenSSL 1.0.1n. Relnotes:

svn commit: r284318 - stable/10/sys/fs/nfsserver

Author: rmacklem Date: Fri Jun 12 13:42:53 2015 New Revision: 284318 URL: https://svnweb.freebsd.org/changeset/base/284318 Log: Add TUNABLE_INT() macros so that the tunables MFC'd from head as r284216 are set via /boot/loader.conf in stable/10. This is a direct commit to stable/10 because TU

svn commit: r284313 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Author: avg Date: Fri Jun 12 11:49:05 2015 New Revision: 284313 URL: https://svnweb.freebsd.org/changeset/base/284313 Log: MFC r283525: zfs: fixes for a full stream received into an existing dataset Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Directory Proper

svn commit: r284311 - stable/10/sys/boot/userboot/userboot

Author: avg Date: Fri Jun 12 11:41:33 2015 New Revision: 284311 URL: https://svnweb.freebsd.org/changeset/base/284311 Log: MFC r283939: userboot: enable bzipfs support Modified: stable/10/sys/boot/userboot/userboot/conf.c Directory Properties: stable/10/ (props changed) Modified: stable/