Public Git Hosting - unleashed.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 52e49eb c574975)

commit	ca100731a46aa43a2f30202aaa54cdac15cf0d7f
author	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Mon, 4 Mar 2019 13:22:41 +0000 (4 08:22 -0500)
committer	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Mon, 4 Mar 2019 13:22:41 +0000 (4 08:22 -0500)
tree	4c176998f57294348ecdad28cee2efd09b9a0c35	tree \| snapshot (tar.gz zip)
parent	52e49ebfd5b12ca50131a59e4a4fcd4d63e0991f	commit \| diff
parent	c5749750a3e052f1194f65a303456224c51dea63	commit \| diff

Merge illumos-gate

18 files changed:

kernel/comstar/lu/stmf_sbd/sbd_zvol.c	diff1 \|	diff2 \|	blob \| history
kernel/fs/zfs/sys/dmu.h	diff1 \|	\|	blob \| history
kernel/fs/zfs/sys/zfs_rlock.h	diff1 \|	diff2 \|	blob \| history
kernel/fs/zfs/sys/zfs_znode.h	diff1 \|	\|	blob \| history
kernel/fs/zfs/zfs_rlock.c	diff1 \|	diff2 \|	blob \| history
kernel/fs/zfs/zfs_vnops.c	diff1 \|	\|	blob \| history
kernel/fs/zfs/zfs_znode.c	diff1 \|	\|	blob \| history
kernel/fs/zfs/zvol.c	diff1 \|	\|	blob \| history
kernel/net/mi.c	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/boot/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.xs	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/rmformat/rmf_slice.c	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/sgs/rtld/common/external.c	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/ztest/ztest.c	diff1 \|	diff2 \|	blob \| history
usr/src/lib/libc/port/threads/pthread.c	diff1 \|	diff2 \|	blob \| history
usr/src/pkg/manifests/system-boot-real-mode.mf	diff1 \|	diff2 \|	blob \| history
usr/src/pkg/manifests/system-kernel.mf	diff1 \|	diff2 \|	blob \| history
usr/src/psm/stand/bootblks/ufs/i386/Makefile	diff1 \|	diff2 \|	blob \| history

Unleashed OS