[illumos-gate merge]

commit 7c8c0b8227679b4684566e408ccc96d6ef7175e9
    14587 bhyve and viona belong in uts/intel

Conflicts:
    usr/src/cmd/bhyve/Makefile
    usr/src/lib/brand/bhyve/zone/Makefile

3 files changed, 44 insertions, 44 deletions

diff --git a/exception_lists/copyright b/exception_lists/copyright
index aa66a27c52..12e0280517 100644
--- a/exception_lists/copyright
+++ b/exception_lists/copyright
@@ -569,36 +569,36 @@ usr/src/contrib/bhyve/*
 usr/src/lib/libvmmapi/THIRDPARTYLICENSE
 usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip
 usr/src/lib/libvmmapi/common/vmmapi.[ch]
-usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE
-usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip
-usr/src/uts/i86pc/io/vmm/amd/*.[chs]
-usr/src/uts/i86pc/io/vmm/intel/*.[chs]
-usr/src/uts/i86pc/io/vmm/intel/offsets.in
-usr/src/uts/i86pc/io/vmm/io/*.[ch]
-usr/src/uts/i86pc/io/vmm/README.sync
-usr/src/uts/i86pc/io/vmm/vmm.c
-usr/src/uts/i86pc/io/vmm/vmm_host.[ch]
-usr/src/uts/i86pc/io/vmm/vmm_instruction_emul.c
-usr/src/uts/i86pc/io/vmm/vmm_ioport.[ch]
-usr/src/uts/i86pc/io/vmm/vmm_ipi.h
-usr/src/uts/i86pc/io/vmm/vmm_ktr.h
-usr/src/uts/i86pc/io/vmm/vmm_lapic.[ch]
-usr/src/uts/i86pc/io/vmm/vmm_mem.[ch]
-usr/src/uts/i86pc/io/vmm/vmm_sol_dev.c
-usr/src/uts/i86pc/io/vmm/vmm_sol_glue.c
-usr/src/uts/i86pc/io/vmm/vmm_sol_mem.c
-usr/src/uts/i86pc/io/vmm/vmm_stat.[ch]
-usr/src/uts/i86pc/io/vmm/vmm_util.[ch]
-usr/src/uts/i86pc/io/vmm/vmx_assym.s
-usr/src/uts/i86pc/io/vmm/x86.[ch]
-usr/src/uts/i86pc/sys/vmm.h
-usr/src/uts/i86pc/sys/vmm_dev.h
+usr/src/uts/intel/io/vmm/THIRDPARTYLICENSE
+usr/src/uts/intel/io/vmm/THIRDPARTYLICENSE.descrip
+usr/src/uts/intel/io/vmm/amd/*.[chs]
+usr/src/uts/intel/io/vmm/intel/*.[chs]
+usr/src/uts/intel/io/vmm/intel/offsets.in
+usr/src/uts/intel/io/vmm/io/*.[ch]
+usr/src/uts/intel/io/vmm/README.sync
+usr/src/uts/intel/io/vmm/vmm.c
+usr/src/uts/intel/io/vmm/vmm_host.[ch]
+usr/src/uts/intel/io/vmm/vmm_instruction_emul.c
+usr/src/uts/intel/io/vmm/vmm_ioport.[ch]
+usr/src/uts/intel/io/vmm/vmm_ipi.h
+usr/src/uts/intel/io/vmm/vmm_ktr.h
+usr/src/uts/intel/io/vmm/vmm_lapic.[ch]
+usr/src/uts/intel/io/vmm/vmm_mem.[ch]
+usr/src/uts/intel/io/vmm/vmm_sol_dev.c
+usr/src/uts/intel/io/vmm/vmm_sol_glue.c
+usr/src/uts/intel/io/vmm/vmm_sol_mem.c
+usr/src/uts/intel/io/vmm/vmm_stat.[ch]
+usr/src/uts/intel/io/vmm/vmm_util.[ch]
+usr/src/uts/intel/io/vmm/vmx_assym.s
+usr/src/uts/intel/io/vmm/x86.[ch]
+usr/src/uts/intel/io/vmm/README.license
+usr/src/uts/intel/sys/vmm.h
+usr/src/uts/intel/sys/vmm_dev.h
+usr/src/uts/intel/io/viona/THIRDPARTYLICENSE
+usr/src/uts/intel/io/viona/THIRDPARTYLICENSE.descrip
 usr/src/cmd/bhyve/README.license
 usr/src/cmd/bhyvectl/README.license
 usr/src/lib/libvmmapi/README.license
-usr/src/uts/i86pc/io/vmm/README.license
-usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE
-usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip
 
 #
 # Various bits from the mdb test suite that represent literal input to
diff --git a/exception_lists/cstyle b/exception_lists/cstyle
index 5d2b11b18f..21cd3dd186 100644
--- a/exception_lists/cstyle
+++ b/exception_lists/cstyle
@@ -1421,8 +1421,8 @@ usr/src/compat/bhyve/*
 usr/src/contrib/bhyve/*
 usr/src/lib/libvmmapi/common/vmmapi.[ch]
 usr/src/test/libc-tests/tests/qsort/*.c
-usr/src/uts/i86pc/io/vmm/amd/amdvi_*.[ch]
-usr/src/uts/i86pc/io/vmm/amd/ivrs_*.c
-usr/src/uts/i86pc/sys/vmm.h
-usr/src/uts/i86pc/sys/vmm_dev.h
+usr/src/uts/intel/io/vmm/amd/amdvi_*.[ch]
+usr/src/uts/intel/io/vmm/amd/ivrs_*.c
+usr/src/uts/intel/sys/vmm.h
+usr/src/uts/intel/sys/vmm_dev.h
 usr/src/lib/lib9p/common/*
diff --git a/exception_lists/hdrchk b/exception_lists/hdrchk
index d75f34c5f4..bf33421d86 100644
--- a/exception_lists/hdrchk
+++ b/exception_lists/hdrchk
@@ -432,17 +432,17 @@ usr/src/cmd/bhyve/xmsr.h
 usr/src/compat/bhyve/*
 usr/src/contrib/bhyve/*
 usr/src/lib/libvmmapi/common/vmmapi.h
-usr/src/uts/i86pc/io/vmm/intel/*.h
-usr/src/uts/i86pc/io/vmm/io/*.h
-usr/src/uts/i86pc/io/vmm/vmm_host.h
-usr/src/uts/i86pc/io/vmm/vmm_ioport.h
-usr/src/uts/i86pc/io/vmm/vmm_ipi.h
-usr/src/uts/i86pc/io/vmm/vmm_ktr.h
-usr/src/uts/i86pc/io/vmm/vmm_lapic.h
-usr/src/uts/i86pc/io/vmm/vmm_mem.h
-usr/src/uts/i86pc/io/vmm/vmm_stat.h
-usr/src/uts/i86pc/io/vmm/vmm_util.h
-usr/src/uts/i86pc/io/vmm/x86.h
-usr/src/uts/i86pc/sys/vmm.h
-usr/src/uts/i86pc/sys/vmm_dev.h
+usr/src/uts/intel/io/vmm/intel/*.h
+usr/src/uts/intel/io/vmm/io/*.h
+usr/src/uts/intel/io/vmm/vmm_host.h
+usr/src/uts/intel/io/vmm/vmm_ioport.h
+usr/src/uts/intel/io/vmm/vmm_ipi.h
+usr/src/uts/intel/io/vmm/vmm_ktr.h
+usr/src/uts/intel/io/vmm/vmm_lapic.h
+usr/src/uts/intel/io/vmm/vmm_mem.h
+usr/src/uts/intel/io/vmm/vmm_stat.h
+usr/src/uts/intel/io/vmm/vmm_util.h
+usr/src/uts/intel/io/vmm/x86.h
+usr/src/uts/intel/sys/vmm.h
+usr/src/uts/intel/sys/vmm_dev.h
 usr/src/lib/lib9p/common/*