Merge commit '37e84ab74e939caf52150fc3352081786ecc0c29' into merges
commit2af7a8243d51c45fdc735372de3c49dc761cb2a1
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 14:19:49 +0000 (13 10:19 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 14:33:40 +0000 (13 10:33 -0400)
treefb67eb27ba84d51cab733152df22b9986961fcf9
parent4c4247bbb63915a5cb7eb20a9c913af6cf34d505
parent37e84ab74e939caf52150fc3352081786ecc0c29
Merge commit '37e84ab74e939caf52150fc3352081786ecc0c29' into merges
15 files changed:
include/sys/ccompile.h
include/sys/modctl.h
include/sys/taskq_impl.h
kernel/drivers/net/wifi/ath/ath_main.c
kernel/fs/zfs/abd.c
kernel/fs/zfs/dsl_pool.c
kernel/fs/zfs/sys/dsl_pool.h
kernel/fs/zfs/sys/zil_impl.h
kernel/fs/zfs/zil.c
kernel/os/taskq.c
usr/src/boot/sys/boot/efi/boot1/Makefile
usr/src/boot/sys/boot/efi/loader/Makefile
usr/src/uts/common/io/bscv.c
usr/src/uts/common/io/usb/clients/usbser/usbser.c
usr/src/uts/common/io/usb/clients/usbser/usbser_rseq.c