?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d7fd8a4 a71e11e)
Merge commit 'a71e11eee4676204c7609c4c9703cc98fbf4669d' into merges
commit56760cf0eff4762479d81ddf9ed1232fbc2c137f
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 22:35:08 +0000 (17 18:35 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 22:35:08 +0000 (17 18:35 -0400)
treeb8273f00e5cbcb6d34c36143984e5a50462b95a4tree | snapshot (tar.gz zip)
parentd7fd8a4e7df1877f42cf49a7de817db527fa5ad6commit | diff
parenta71e11eee4676204c7609c4c9703cc98fbf4669dcommit | diff
Merge commit 'a71e11eee4676204c7609c4c9703cc98fbf4669d' into merges
26 files changed:
include/sys/fs/zfs.h diff1 |   |  blob | history
kernel/drivers/scsi/mega_sas/megaraid_sas.c diff1 |   |  blob | history
kernel/drivers/scsi/mr_sas/mr_sas.c diff1 |   |  blob | history
kernel/fs/zfs/dsl_destroy.c diff1 |  diff2 |  blob | history
kernel/fs/zfs/sys/zcp.h diff1 |  diff2 |  blob | history
kernel/fs/zfs/zcp.c diff1 |   |  blob | history
kernel/fs/zfs/zcp_synctask.c diff1 |   |  blob | history
kernel/fs/zfs/zfs_ioctl.c diff1 |   |  blob | history
share/man/man8/zfs-program.8 diff1 |   |  blob | history
share/man/man8/zfs.8 diff1 |   |  blob | history
usr/src/cmd/svc/configd/rc_node.c diff1 |  diff2 |  blob | history
usr/src/cmd/zfs/zfs_main.c diff1 |  diff2 |  blob | history
usr/src/lib/libadm/common/ckdate.c diff1 |  diff2 |  blob | history
usr/src/lib/libast/Makefile.com diff1 |  diff2 |  blob | history
usr/src/lib/libc/port/nsl/publickey.c diff1 |   |  blob | history
usr/src/lib/libima/Makefile diff1 |  diff2 |  blob | history
usr/src/lib/libnisdb/ldap_map.c diff1 |  diff2 |  blob | history
usr/src/lib/libsldap/common/ns_mapping.c diff1 |  diff2 |  blob | history
usr/src/lib/libsmedia/plugins/scsi/common/s_generic.c diff1 |  diff2 |  blob | history
usr/src/lib/libzfs/common/libzfs_dataset.c diff1 |  diff2 |  blob | history
usr/src/lib/libzfs_core/common/libzfs_core.c diff1 |  diff2 |  blob | history
usr/src/lib/mpapi/libmpapi/common/mpapi.c diff1 |  diff2 |  blob | history
usr/src/lib/pam_modules/sample/sample_acct_mgmt.c diff1 |  diff2 |  blob | history
usr/src/uts/common/io/ib/adapters/hermon/hermon_ioctl.c diff1 |  diff2 |  blob | history
usr/src/uts/common/io/ib/adapters/tavor/tavor_ioctl.c diff1 |  diff2 |  blob | history
usr/src/uts/common/io/ntxn/unm_nic.h diff1 |  diff2 |  blob | history
Unleashed OS