diff options
| author | avg <avg@FreeBSD.org> | 2017-11-08 08:53:44 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2017-11-08 08:53:44 +0000 |
| commit | b6de21de0e6db7018f1a79f4e09e03275f27996f (patch) | |
| tree | b2759dacc4451acb8160eb54bbfb03a46b717288 /cddl/sbin | |
| parent | 6e9e392726d7f3de7de620e7aa763f41e60475b1 (diff) | |
| download | FreeBSD-src-b6de21de0e6db7018f1a79f4e09e03275f27996f.zip FreeBSD-src-b6de21de0e6db7018f1a79f4e09e03275f27996f.tar.gz | |
MFC r324163: MFV r323530,r323533,r323534: 7431 ZFS Channel Programs, and followups
Also MFC-ed are the following fixes:
- r324164 Add several new files to the files enabled by ZFS kernel option
- r324178 unbreak kernel builds on sparc64 and powerpc
- r324194 fix incorrect use of getzfsvfs_impl in r324163
- r324292 really unbreak kernel builds on sparc64 and powerpc64
Diffstat (limited to 'cddl/sbin')
| -rw-r--r-- | cddl/sbin/zfs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index e0d6faa..9d6075e 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -3,7 +3,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zfs PROG= zfs -MAN= zfs.8 +MAN= zfs.8 zfs-program.8 SRCS= zfs_main.c zfs_iter.c WARNS?= 0 |
