Author: avg
Date: Mon Aug 15 08:44:22 2016
New Revision: 304114
URL: https://svnweb.freebsd.org/changeset/base/304114
Log:
MFC r303084: 6391 Override default SPA config location via environment
Note that there was a merge conflict because of an unmerged earlier
change.
Modified:
stable
Author: avg
Date: Mon Aug 15 08:49:31 2016
New Revision: 304119
URL: https://svnweb.freebsd.org/changeset/base/304119
Log:
MFC r303086: 7164 zdb should be able to open the root dataset
Modified:
stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.8
stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.c
Author: avg
Date: Mon Aug 15 08:53:24 2016
New Revision: 304120
URL: https://svnweb.freebsd.org/changeset/base/304120
Log:
MFC r302839: 6940 Cannot unlink directories when over quota
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/9
Author: avg
Date: Mon Aug 15 09:01:30 2016
New Revision: 304126
URL: https://svnweb.freebsd.org/changeset/base/304126
Log:
MFC r302840: 6878 Add scrub completion info to "zpool history"
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
Directory Properties:
stable
Author: hselasky
Date: Mon Aug 15 09:03:05 2016
New Revision: 304129
URL: https://svnweb.freebsd.org/changeset/base/304129
Log:
MFC r303765:
Keep a reference count on USB keyboard polling to allow recursive
cngrab() during a panic for example, similar to what the AT-keyboard
driver is doin
Author: avg
Date: Mon Aug 15 09:06:33 2016
New Revision: 304132
URL: https://svnweb.freebsd.org/changeset/base/304132
Log:
MFC r302835: fix-up for configuration of AMD Family 10h processors
borrowed from Linux
Modified:
stable/9/sys/amd64/amd64/initcpu.c
Directory Properties:
stable/9/sys
Author: avg
Date: Mon Aug 15 09:27:15 2016
New Revision: 304141
URL: https://svnweb.freebsd.org/changeset/base/304141
Log:
Revert r304120: MFC r302839: 6940 Cannot unlink directories when over quota
There is no dmu_tx_mark_netfree() function in this branch.
Modified:
stable/9/sys/cddl/co