Merge commit 'b6031810da58df96413bf76e068638fcab1f228a'
commit8afcfbe7e4a6ee36a2c91e9504d6cfc51bd7cc7b
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 22 Aug 2018 16:25:13 +0000 (22 12:25 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 22 Aug 2018 17:54:45 +0000 (22 13:54 -0400)
tree70914a1cf12eee283e22980efcf6b5ee03fab620
parentd713ce1071d4f92967437164dc9f92dd3b86ac5c
parentb6031810da58df96413bf76e068638fcab1f228a
Merge commit 'b6031810da58df96413bf76e068638fcab1f228a'
27 files changed:
arch/x86/include/sys/segments.h
arch/x86/include/sys/x86_archext.h
arch/x86/kernel/offsets.in
arch/x86/kernel/os/desctbls.c
arch/x86/kernel/os/sysi86.c
arch/x86/kernel/platform/i86pc/os/mlsetup.c
arch/x86/kernel/platform/i86pc/os/mp_startup.c
exception_lists/cstyle
exception_lists/hdrchk
include/sys/proc.h
kernel/fs/zfs/zil.c
share/man/man7d/Makefile
share/man/man7d/qede.7d
usr/src/pkg/manifests/driver-network-qede.inc
usr/src/pkg/manifests/system-kernel.mf
usr/src/pkg/manifests/system-test-ostest.mf
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/test/os-tests/tests/i386/Makefile
usr/src/test/zfs-tests/include/libtest.shlib
usr/src/uts/common/Makefile.files
usr/src/uts/common/Makefile.rules
usr/src/uts/common/io/ldterm.c
usr/src/uts/common/io/qede/qede_fp.c
usr/src/uts/common/io/qede/qede_main.c
usr/src/uts/common/io/qede/qede_types.h
usr/src/uts/intel/Makefile.intel
usr/src/uts/intel/qede/Makefile