Merge ^/head r336870 through r337285, and resolve conflicts.
Description
Description
Details
Details
- Provenance
dim Authored on - Parents
- rS337285: efi-autoresizecons: Don't fail the boot w/o GOP or UGA
- Branches
- Unknown
- Tags
Tags None Referenced Files None Subscribers None
Description Merge ^/head r336870 through r337285, and resolve conflicts.
Details
Changes (416)
rS337286 projects/clang700-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localudplite.kshLoading... projects/clang700-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localudplite.ksh.outLoading... projects/clang700-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remoteudplite.kshLoading... projects/clang700-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remoteudplite.ksh.outLoading... projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.hLoading... projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_initialize.hLoading... projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_removal.hLoading... projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_priority.hLoading... projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect_mapping.cLoading... |