Merge commit 'ad3ad82ad2fb99c424a8482bd1908d08b990ccea'
commit52dfe198e3368d15a11d728a5274d263d26da5bf
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 11:52:03 +0000 (17 07:52 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 11:52:03 +0000 (17 07:52 -0400)
tree45b774d567827e41cbce171c8cff017f049e20d5
parent620cb45e90334509a82fe5a805b81575cfeb5b91
parentad3ad82ad2fb99c424a8482bd1908d08b990ccea
Merge commit 'ad3ad82ad2fb99c424a8482bd1908d08b990ccea'
kernel/drivers/net/i40e/i40e_main.c
kernel/drivers/net/i40e/i40e_sw.h
share/man/man7d/i40e.7d
share/man/man8/svcadm.8
usr/src/boot/lib/libstand/net.c
usr/src/cmd/fs.d/autofs/autod_nfs.c
usr/src/cmd/fs.d/autofs/ns_files.c
usr/src/lib/libscf/common/lowlevel.c
usr/src/pkg/manifests/driver-network-i40e.mf