Merge illumos-gate
commit596e2eaa54af8d0ffcc249bc165d6ba50bd8a714
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 4 Mar 2019 18:35:57 +0000 (4 13:35 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 4 Mar 2019 18:35:57 +0000 (4 13:35 -0500)
tree9df8fb47326dbb724735f608311d81c4f4c12521
parent576810ed9b50993677ef97cbfa7b3f0d3c93d47e
parent9890ff8357a674572254e0be06b175a1e8eab4b0
Merge illumos-gate
21 files changed:
include/sys/consplat.h
include/sys/vgareg.h
include/sys/vgasubr.h
include/sys/visual_io.h
share/man/man5/loader.5
usr/src/Makefile.master
usr/src/boot/sys/boot/Makefile.inc
usr/src/boot/sys/boot/common/module.c
usr/src/boot/sys/boot/efi/Makefile.inc
usr/src/boot/sys/boot/efi/libefi/Makefile.com
usr/src/boot/sys/boot/efi/loader/Makefile.com
usr/src/boot/sys/boot/efi/loader/framebuffer.c
usr/src/boot/sys/boot/forth/Makefile.inc
usr/src/boot/sys/boot/i386/libi386/Makefile
usr/src/boot/sys/boot/i386/loader/Makefile
usr/src/boot/sys/boot/libficl/Makefile.com
usr/src/boot/sys/cddl/boot/zfs/zfsimpl.h
usr/src/common/ficl/loader.c
usr/src/lib/libficl/Makefile.com
usr/src/pkg/manifests/system-boot-loader.mf
usr/src/uts/common/Makefile.rules