Module Name: src Committed By: hannken Date: Mon Jun 24 08:27:21 UTC 2019
Modified Files: src/usr.sbin/fstyp: Makefile Added Files: src/external/cddl/osnet/dist: OPENSOLARIS.LICENSE src/external/cddl/osnet/dist/cmd/zdb: zdb.8 src/external/cddl/osnet/dist/cmd/zfs: zfs.8 src/external/cddl/osnet/dist/cmd/zpool: zpool-features.7 zpool.8 src/external/cddl/osnet/dist/head: libintl.h stdio_ext.h thread.h src/external/cddl/osnet/dist/uts/common/os: callb.c fm.c src/external/cddl/osnet/dist/uts/common/sys: extdirent.h isa_defs.h procset.h sysmacros.h Removed Files: src/external/cddl/osnet: OPENSOLARIS.LICENSE src/external/cddl/osnet/include: libintl.h stdio_ext.h thread.h src/external/cddl/osnet/sbin/zfs: zfs.8 src/external/cddl/osnet/sbin/zpool: zpool-features.7 zpool.8 src/external/cddl/osnet/sys/kern: callb.c fm.c src/external/cddl/osnet/sys/sys: extdirent.h isa_defs.h procset.h sysmacros.h src/external/cddl/osnet/usr.sbin/zdb: zdb.8 Log Message: Sync with upstream r315983. Move files originating from upstream below "dist/": OPENSOLARIS.LICENSE -> dist/OPENSOLARIS.LICENSE usr.sbin/zdb/zdb.8 -> dist/cmd/zdb/zdb.8 sbin/zfs/zfs.8 -> dist/cmd/zfs/zfs.8 sbin/zpool/zpool-features.7 -> dist/cmd/zpool/zpool-features.7 sbin/zpool/zpool.8 -> dist/cmd/zpool/zpool.8 include/libintl.h -> dist/head/libintl.h include/stdio_ext.h -> dist/head/stdio_ext.h include/thread.h -> dist/head/thread.h sys/kern/callb.c -> dist/uts/common/os/callb.c sys/kern/fm.c -> dist/uts/common/os/fm.c sys/sys/extdirent.h -> dist/uts/common/sys/extdirent.h sys/sys/isa_defs.h -> dist/uts/common/sys/isa_defs.h sys/sys/procset.h -> dist/uts/common/sys/procset.h sys/sys/sysmacros.h -> dist/uts/common/sys/sysmacros.h Adapt "usr.sbin/fstyp/Makefile". To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/external/cddl/osnet/OPENSOLARIS.LICENSE cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/OPENSOLARIS.LICENSE cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/cmd/zdb/zdb.8 cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/cmd/zfs/zfs.8 cvs rdiff -u -r0 -r1.1 \ src/external/cddl/osnet/dist/cmd/zpool/zpool-features.7 \ src/external/cddl/osnet/dist/cmd/zpool/zpool.8 cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/head/libintl.h \ src/external/cddl/osnet/dist/head/stdio_ext.h \ src/external/cddl/osnet/dist/head/thread.h cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/uts/common/os/callb.c \ src/external/cddl/osnet/dist/uts/common/os/fm.c cvs rdiff -u -r0 -r1.1 \ src/external/cddl/osnet/dist/uts/common/sys/extdirent.h \ src/external/cddl/osnet/dist/uts/common/sys/isa_defs.h \ src/external/cddl/osnet/dist/uts/common/sys/procset.h \ src/external/cddl/osnet/dist/uts/common/sys/sysmacros.h cvs rdiff -u -r1.4 -r0 src/external/cddl/osnet/include/libintl.h cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/include/stdio_ext.h cvs rdiff -u -r1.5 -r0 src/external/cddl/osnet/include/thread.h cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/sbin/zfs/zfs.8 cvs rdiff -u -r1.1 -r0 src/external/cddl/osnet/sbin/zpool/zpool-features.7 cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/sbin/zpool/zpool.8 cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/sys/kern/callb.c cvs rdiff -u -r1.3 -r0 src/external/cddl/osnet/sys/kern/fm.c cvs rdiff -u -r1.1 -r0 src/external/cddl/osnet/sys/sys/extdirent.h cvs rdiff -u -r1.4 -r0 src/external/cddl/osnet/sys/sys/isa_defs.h cvs rdiff -u -r1.3 -r0 src/external/cddl/osnet/sys/sys/procset.h cvs rdiff -u -r1.10 -r0 src/external/cddl/osnet/sys/sys/sysmacros.h cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/usr.sbin/zdb/zdb.8 cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/fstyp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.