svn commit: r295915 - stable/9/contrib/libarchive/libarchive

2016-02-23 Thread Xin LI
Author: delphij Date: Tue Feb 23 08:12:39 2016 New Revision: 295915 URL: https://svnweb.freebsd.org/changeset/base/295915 Log: Instant-MFC r295914: MFV r295913: Partially apply upstream changeset 6e06b1c8 (kientzle). Limit filter recursion level to 25 (instead of infinite). This fixes

svn commit: r295963 - in stable/9/cddl/contrib/opensolaris/cmd: zfs zpool

2016-02-23 Thread Dimitry Andric
Author: dim Date: Wed Feb 24 07:53:57 2016 New Revision: 295963 URL: https://svnweb.freebsd.org/changeset/base/295963 Log: MFC r295844: Fix "invalid type '(null)'" usage messages in zfs(8) and zpool(8). Currently, zfs(8) and zpool(8) print "invalid type '(null)'" or similar messages,