Public Git Hosting - unleashed.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 41d7433 b1e7e97)

commit	6bda52c9e4cc03a23a2e13c665e3417a8f032123
author	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Sun, 6 Jan 2019 02:49:08 +0000 (5 21:49 -0500)
committer	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Sun, 6 Jan 2019 02:49:08 +0000 (5 21:49 -0500)
tree	2c7f660150ba31fc6118deba142e5b18e3112187	tree \| snapshot (tar.gz zip)
parent	41d74337cdc1578c4f1cfc3b73e80527b0f5c80f	commit \| diff
parent	b1e7e97d3b60469b243b3b2e22c7d8cbd11c7c90	commit \| diff

Merge commit 'b1e7e97d3b60469b243b3b2e22c7d8cbd11c7c90'

19 files changed:

include/sys/Makefile	diff1 \|	\|	blob \| history
include/sys/containerof.h	\|	diff2 \|	blob \| history
include/sys/mac.h	diff1 \|	diff2 \|	blob \| history
include/sys/mac_soft_ring.h	diff1 \|	diff2 \|	blob \| history
include/sys/stddef.h	diff1 \|	diff2 \|	blob \| history
kernel/drivers/net/vioif/vioif.c	diff1 \|	diff2 \|	blob \| history
kernel/fs/zfs/sys/dmu.h	diff1 \|	\|	blob \| history
kernel/net/ip/rts.c	diff1 \|	\|	blob \| history
usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_rport.c	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/sgs/elfedit/common/elfedit_machelf.c	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/svc/common/manifest_hash.c	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/svc/svccfg/svccfg_libscf.c	diff1 \|	diff2 \|	blob \| history
usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c	diff1 \|	diff2 \|	blob \| history
usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c	diff1 \|	diff2 \|	blob \| history
usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c	diff1 \|	diff2 \|	blob \| history
usr/src/pkg/manifests/system-header.mf	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/io/hook.c	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/io/ib/clients/rdsv3/ib_recv.c	diff1 \|	diff2 \|	blob \| history
usr/src/uts/intel/asm/cpu.h	diff1 \|	diff2 \|	blob \| history

Unleashed OS