11843 update Intel microcode to 20190918 (fix mismerge)

157 files changed, 148 insertions, 178 deletions

diff --git a/manifest b/manifest
index 66d5d46b6c..18035c6e0f 100644
--- a/manifest
+++ b/manifest
@@ -267,8 +267,8 @@ d etc/bash 0755 root sys
 f etc/bash/bash_completion 0644 root sys
 d etc/bash/bash_completion.d 0755 root sys
 f etc/bash/bash_completion.d/dladm 0644 root sys
-f etc/bash/bash_completion.d/zones 0644 root sys
 f etc/bash/bash_completion.d/zone_alias 0644 root sys
+f etc/bash/bash_completion.d/zones 0644 root sys
 d etc/brand 0755 root sys
 d etc/certs 0755 root sys
 d etc/cron.d 0755 root sys
@@ -1897,9 +1897,9 @@ f platform/i86pc/kernel/drv/amd64/cpc 0755 root sys
 f platform/i86pc/kernel/drv/amd64/cpudrv 0755 root sys
 f platform/i86pc/kernel/drv/amd64/dr 0755 root sys
 f platform/i86pc/kernel/drv/amd64/fipe 0755 root sys
-f platform/i86pc/kernel/drv/amd64/ioat 0755 root sys
 f platform/i86pc/kernel/drv/amd64/imc 0755 root sys
 f platform/i86pc/kernel/drv/amd64/imcstub 0755 root sys
+f platform/i86pc/kernel/drv/amd64/ioat 0755 root sys
 f platform/i86pc/kernel/drv/amd64/isa 0755 root sys
 f platform/i86pc/kernel/drv/amd64/npe 0755 root sys
 f platform/i86pc/kernel/drv/amd64/pci 0755 root sys
@@ -1912,8 +1912,8 @@ f platform/i86pc/kernel/drv/amd_iommu.conf 0644 root sys
 f platform/i86pc/kernel/drv/cpc.conf 0644 root sys
 f platform/i86pc/kernel/drv/dr.conf 0644 root sys
 f platform/i86pc/kernel/drv/fipe.conf 0644 root sys
-f platform/i86pc/kernel/drv/ioat.conf 0644 root sys
 f platform/i86pc/kernel/drv/imc.conf 0644 root sys
+f platform/i86pc/kernel/drv/ioat.conf 0644 root sys
 f platform/i86pc/kernel/drv/pci-ide.conf 0644 root sys
 f platform/i86pc/kernel/drv/pit_beep.conf 0644 root sys
 f platform/i86pc/kernel/drv/ppm.conf 0644 root sys
@@ -2087,62 +2087,62 @@ f platform/i86pc/ucode/GenuineIntel/00000F29-02 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F29-04 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F29-08 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F32-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F32-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F32-08 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F32-04=platform/i86pc/ucode/GenuineIntel/00000F32-01
+h platform/i86pc/ucode/GenuineIntel/00000F32-08=platform/i86pc/ucode/GenuineIntel/00000F32-01
 f platform/i86pc/ucode/GenuineIntel/00000F33-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F33-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F33-08 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F33-04=platform/i86pc/ucode/GenuineIntel/00000F33-01
+h platform/i86pc/ucode/GenuineIntel/00000F33-08=platform/i86pc/ucode/GenuineIntel/00000F33-01
 f platform/i86pc/ucode/GenuineIntel/00000F34-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F34-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F34-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F34-10 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F34-04=platform/i86pc/ucode/GenuineIntel/00000F34-01
+h platform/i86pc/ucode/GenuineIntel/00000F34-08=platform/i86pc/ucode/GenuineIntel/00000F34-01
+h platform/i86pc/ucode/GenuineIntel/00000F34-10=platform/i86pc/ucode/GenuineIntel/00000F34-01
 f platform/i86pc/ucode/GenuineIntel/00000F41-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F41-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F41-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F41-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F41-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F41-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F41-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F41-04=platform/i86pc/ucode/GenuineIntel/00000F41-01
+h platform/i86pc/ucode/GenuineIntel/00000F41-08=platform/i86pc/ucode/GenuineIntel/00000F41-01
+h platform/i86pc/ucode/GenuineIntel/00000F41-10=platform/i86pc/ucode/GenuineIntel/00000F41-01
+h platform/i86pc/ucode/GenuineIntel/00000F41-20=platform/i86pc/ucode/GenuineIntel/00000F41-01
+h platform/i86pc/ucode/GenuineIntel/00000F41-80=platform/i86pc/ucode/GenuineIntel/00000F41-01
 f platform/i86pc/ucode/GenuineIntel/00000F43-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F43-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F43-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F43-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F43-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F43-04=platform/i86pc/ucode/GenuineIntel/00000F43-01
+h platform/i86pc/ucode/GenuineIntel/00000F43-08=platform/i86pc/ucode/GenuineIntel/00000F43-01
+h platform/i86pc/ucode/GenuineIntel/00000F43-10=platform/i86pc/ucode/GenuineIntel/00000F43-01
+h platform/i86pc/ucode/GenuineIntel/00000F43-80=platform/i86pc/ucode/GenuineIntel/00000F43-01
 f platform/i86pc/ucode/GenuineIntel/00000F44-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F44-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F44-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F44-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F44-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F44-04=platform/i86pc/ucode/GenuineIntel/00000F44-01
+h platform/i86pc/ucode/GenuineIntel/00000F44-08=platform/i86pc/ucode/GenuineIntel/00000F44-01
+h platform/i86pc/ucode/GenuineIntel/00000F44-10=platform/i86pc/ucode/GenuineIntel/00000F44-01
+h platform/i86pc/ucode/GenuineIntel/00000F44-80=platform/i86pc/ucode/GenuineIntel/00000F44-01
 f platform/i86pc/ucode/GenuineIntel/00000F47-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F47-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F47-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F47-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F47-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F47-04=platform/i86pc/ucode/GenuineIntel/00000F47-01
+h platform/i86pc/ucode/GenuineIntel/00000F47-08=platform/i86pc/ucode/GenuineIntel/00000F47-01
+h platform/i86pc/ucode/GenuineIntel/00000F47-10=platform/i86pc/ucode/GenuineIntel/00000F47-01
+h platform/i86pc/ucode/GenuineIntel/00000F47-80=platform/i86pc/ucode/GenuineIntel/00000F47-01
 f platform/i86pc/ucode/GenuineIntel/00000F48-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F48-02 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F48-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F48-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F48-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F48-40 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F48-08=platform/i86pc/ucode/GenuineIntel/00000F48-04
+h platform/i86pc/ucode/GenuineIntel/00000F48-10=platform/i86pc/ucode/GenuineIntel/00000F48-04
+h platform/i86pc/ucode/GenuineIntel/00000F48-40=platform/i86pc/ucode/GenuineIntel/00000F48-04
 f platform/i86pc/ucode/GenuineIntel/00000F49-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F49-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F49-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F49-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F49-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F49-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F49-04=platform/i86pc/ucode/GenuineIntel/00000F49-01
+h platform/i86pc/ucode/GenuineIntel/00000F49-08=platform/i86pc/ucode/GenuineIntel/00000F49-01
+h platform/i86pc/ucode/GenuineIntel/00000F49-10=platform/i86pc/ucode/GenuineIntel/00000F49-01
+h platform/i86pc/ucode/GenuineIntel/00000F49-20=platform/i86pc/ucode/GenuineIntel/00000F49-01
+h platform/i86pc/ucode/GenuineIntel/00000F49-80=platform/i86pc/ucode/GenuineIntel/00000F49-01
 f platform/i86pc/ucode/GenuineIntel/00000F4A-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F4A-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F4A-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F4A-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F4A-40 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F4A-08=platform/i86pc/ucode/GenuineIntel/00000F4A-04
+h platform/i86pc/ucode/GenuineIntel/00000F4A-10=platform/i86pc/ucode/GenuineIntel/00000F4A-04
+h platform/i86pc/ucode/GenuineIntel/00000F4A-40=platform/i86pc/ucode/GenuineIntel/00000F4A-04
 f platform/i86pc/ucode/GenuineIntel/00000F62-04 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F64-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F64-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F64-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F64-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F64-10=platform/i86pc/ucode/GenuineIntel/00000F64-04
+h platform/i86pc/ucode/GenuineIntel/00000F64-20=platform/i86pc/ucode/GenuineIntel/00000F64-04
 f platform/i86pc/ucode/GenuineIntel/00000F65-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00000F68-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00000F68-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00000F68-20=platform/i86pc/ucode/GenuineIntel/00000F68-02
 f platform/i86pc/ucode/GenuineIntel/00001632-00 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00010661-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00010661-02 0444 root sys
@@ -2155,14 +2155,14 @@ f platform/i86pc/ucode/GenuineIntel/00010676-80 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00010677-10 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/0001067A-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/0001067A-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/0001067A-10 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/0001067A-10=platform/i86pc/ucode/GenuineIntel/0001067A-01
 f platform/i86pc/ucode/GenuineIntel/0001067A-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/0001067A-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/0001067A-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/0001067A-40=platform/i86pc/ucode/GenuineIntel/0001067A-04
+h platform/i86pc/ucode/GenuineIntel/0001067A-80=platform/i86pc/ucode/GenuineIntel/0001067A-20
 f platform/i86pc/ucode/GenuineIntel/000106A4-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000106A4-02 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000106A4-02=platform/i86pc/ucode/GenuineIntel/000106A4-01
 f platform/i86pc/ucode/GenuineIntel/000106A5-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000106A5-02 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000106A5-02=platform/i86pc/ucode/GenuineIntel/000106A5-01
 f platform/i86pc/ucode/GenuineIntel/000106C2-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000106C2-04 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000106C2-08 0444 root sys
@@ -2172,149 +2172,140 @@ f platform/i86pc/ucode/GenuineIntel/000106CA-08 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000106CA-10 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000106D1-08 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000106E5-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000106E5-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000106E5-10 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000106E5-02=platform/i86pc/ucode/GenuineIntel/000106E5-01
+h platform/i86pc/ucode/GenuineIntel/000106E5-10=platform/i86pc/ucode/GenuineIntel/000106E5-01
 f platform/i86pc/ucode/GenuineIntel/00020652-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00020652-10 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00020652-10=platform/i86pc/ucode/GenuineIntel/00020652-02
 f platform/i86pc/ucode/GenuineIntel/00020655-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00020655-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00020655-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00020655-10=platform/i86pc/ucode/GenuineIntel/00020655-02
+h platform/i86pc/ucode/GenuineIntel/00020655-80=platform/i86pc/ucode/GenuineIntel/00020655-02
 f platform/i86pc/ucode/GenuineIntel/00020661-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00020661-02 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000206A7-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206A7-10 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000206A7-10=platform/i86pc/ucode/GenuineIntel/000206A7-02
 f platform/i86pc/ucode/GenuineIntel/000206C2-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206C2-02 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000206C2-02=platform/i86pc/ucode/GenuineIntel/000206C2-01
 f platform/i86pc/ucode/GenuineIntel/000206D6-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206D6-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206D6-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206D6-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206D6-40 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000206D6-04=platform/i86pc/ucode/GenuineIntel/000206D6-01
+h platform/i86pc/ucode/GenuineIntel/000206D6-08=platform/i86pc/ucode/GenuineIntel/000206D6-01
+h platform/i86pc/ucode/GenuineIntel/000206D6-20=platform/i86pc/ucode/GenuineIntel/000206D6-01
+h platform/i86pc/ucode/GenuineIntel/000206D6-40=platform/i86pc/ucode/GenuineIntel/000206D6-01
 f platform/i86pc/ucode/GenuineIntel/000206D7-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206D7-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206D7-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206D7-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206D7-40 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000206D7-04=platform/i86pc/ucode/GenuineIntel/000206D7-01
+h platform/i86pc/ucode/GenuineIntel/000206D7-08=platform/i86pc/ucode/GenuineIntel/000206D7-01
+h platform/i86pc/ucode/GenuineIntel/000206D7-20=platform/i86pc/ucode/GenuineIntel/000206D7-01
+h platform/i86pc/ucode/GenuineIntel/000206D7-40=platform/i86pc/ucode/GenuineIntel/000206D7-01
 f platform/i86pc/ucode/GenuineIntel/000206E6-04 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000206F2-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000206F2-04 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000206F2-04=platform/i86pc/ucode/GenuineIntel/000206F2-01
+f platform/i86pc/ucode/GenuineIntel/00030678-02 0444 root sys
+f platform/i86pc/ucode/GenuineIntel/00030678-04 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00030678-08=platform/i86pc/ucode/GenuineIntel/00030678-04
+f platform/i86pc/ucode/GenuineIntel/00030679-01 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00030679-02=platform/i86pc/ucode/GenuineIntel/00030679-01
+h platform/i86pc/ucode/GenuineIntel/00030679-04=platform/i86pc/ucode/GenuineIntel/00030679-01
+h platform/i86pc/ucode/GenuineIntel/00030679-08=platform/i86pc/ucode/GenuineIntel/00030679-01
 f platform/i86pc/ucode/GenuineIntel/000306A9-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306A9-10 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000306A9-10=platform/i86pc/ucode/GenuineIntel/000306A9-02
 f platform/i86pc/ucode/GenuineIntel/000306C3-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306C3-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306C3-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000306C3-10=platform/i86pc/ucode/GenuineIntel/000306C3-02
+h platform/i86pc/ucode/GenuineIntel/000306C3-20=platform/i86pc/ucode/GenuineIntel/000306C3-02
 f platform/i86pc/ucode/GenuineIntel/000306D4-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306D4-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000306D4-80=platform/i86pc/ucode/GenuineIntel/000306D4-40
 f platform/i86pc/ucode/GenuineIntel/000306E4-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E4-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E4-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E4-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E4-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E4-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000306E4-04=platform/i86pc/ucode/GenuineIntel/000306E4-01
+h platform/i86pc/ucode/GenuineIntel/000306E4-08=platform/i86pc/ucode/GenuineIntel/000306E4-01
+h platform/i86pc/ucode/GenuineIntel/000306E4-20=platform/i86pc/ucode/GenuineIntel/000306E4-01
+h platform/i86pc/ucode/GenuineIntel/000306E4-40=platform/i86pc/ucode/GenuineIntel/000306E4-01
+h platform/i86pc/ucode/GenuineIntel/000306E4-80=platform/i86pc/ucode/GenuineIntel/000306E4-01
 f platform/i86pc/ucode/GenuineIntel/000306E6-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E6-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E6-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E6-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E6-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E6-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000306E6-04=platform/i86pc/ucode/GenuineIntel/000306E6-01
+h platform/i86pc/ucode/GenuineIntel/000306E6-08=platform/i86pc/ucode/GenuineIntel/000306E6-01
+h platform/i86pc/ucode/GenuineIntel/000306E6-20=platform/i86pc/ucode/GenuineIntel/000306E6-01
+h platform/i86pc/ucode/GenuineIntel/000306E6-40=platform/i86pc/ucode/GenuineIntel/000306E6-01
+h platform/i86pc/ucode/GenuineIntel/000306E6-80=platform/i86pc/ucode/GenuineIntel/000306E6-01
 f platform/i86pc/ucode/GenuineIntel/000306E7-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E7-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E7-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E7-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E7-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306E7-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000306E7-04=platform/i86pc/ucode/GenuineIntel/000306E7-01
+h platform/i86pc/ucode/GenuineIntel/000306E7-08=platform/i86pc/ucode/GenuineIntel/000306E7-01
+h platform/i86pc/ucode/GenuineIntel/000306E7-20=platform/i86pc/ucode/GenuineIntel/000306E7-01
+h platform/i86pc/ucode/GenuineIntel/000306E7-40=platform/i86pc/ucode/GenuineIntel/000306E7-01
+h platform/i86pc/ucode/GenuineIntel/000306E7-80=platform/i86pc/ucode/GenuineIntel/000306E7-01
 f platform/i86pc/ucode/GenuineIntel/000306F2-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306F2-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306F2-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306F2-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306F2-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000306F2-40 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000306F2-02=platform/i86pc/ucode/GenuineIntel/000306F2-01
+h platform/i86pc/ucode/GenuineIntel/000306F2-04=platform/i86pc/ucode/GenuineIntel/000306F2-01
+h platform/i86pc/ucode/GenuineIntel/000306F2-08=platform/i86pc/ucode/GenuineIntel/000306F2-01
+h platform/i86pc/ucode/GenuineIntel/000306F2-20=platform/i86pc/ucode/GenuineIntel/000306F2-01
+h platform/i86pc/ucode/GenuineIntel/000306F2-40=platform/i86pc/ucode/GenuineIntel/000306F2-01
 f platform/i86pc/ucode/GenuineIntel/000306F4-80 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00040651-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00040651-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00040651-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00040651-40 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00040651-10=platform/i86pc/ucode/GenuineIntel/00040651-02
+h platform/i86pc/ucode/GenuineIntel/00040651-20=platform/i86pc/ucode/GenuineIntel/00040651-02
+h platform/i86pc/ucode/GenuineIntel/00040651-40=platform/i86pc/ucode/GenuineIntel/00040651-02
 f platform/i86pc/ucode/GenuineIntel/00040661-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00040661-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00040661-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00040661-10=platform/i86pc/ucode/GenuineIntel/00040661-02
+h platform/i86pc/ucode/GenuineIntel/00040661-20=platform/i86pc/ucode/GenuineIntel/00040661-02
 f platform/i86pc/ucode/GenuineIntel/00040671-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00040671-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00040671-20=platform/i86pc/ucode/GenuineIntel/00040671-02
+f platform/i86pc/ucode/GenuineIntel/000406C3-01 0444 root sys
+f platform/i86pc/ucode/GenuineIntel/000406C4-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000406E3-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000406E3-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000406E3-80=platform/i86pc/ucode/GenuineIntel/000406E3-40
 f platform/i86pc/ucode/GenuineIntel/000406F1-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000406F1-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000406F1-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000406F1-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000406F1-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000406F1-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000406F1-80 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050653-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050653-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050653-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050653-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050653-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000406F1-02=platform/i86pc/ucode/GenuineIntel/000406F1-01
+h platform/i86pc/ucode/GenuineIntel/000406F1-04=platform/i86pc/ucode/GenuineIntel/000406F1-01
+h platform/i86pc/ucode/GenuineIntel/000406F1-08=platform/i86pc/ucode/GenuineIntel/000406F1-01
+h platform/i86pc/ucode/GenuineIntel/000406F1-20=platform/i86pc/ucode/GenuineIntel/000406F1-01
+h platform/i86pc/ucode/GenuineIntel/000406F1-40=platform/i86pc/ucode/GenuineIntel/000406F1-01
+h platform/i86pc/ucode/GenuineIntel/000406F1-80=platform/i86pc/ucode/GenuineIntel/000406F1-01
 f platform/i86pc/ucode/GenuineIntel/00050654-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050654-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050654-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050654-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050654-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050654-80 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050655-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050655-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050655-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050655-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050655-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050655-80 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050656-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050656-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050656-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050656-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050656-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050656-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050656-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00050654-02=platform/i86pc/ucode/GenuineIntel/00050654-01
+h platform/i86pc/ucode/GenuineIntel/00050654-04=platform/i86pc/ucode/GenuineIntel/00050654-01
+h platform/i86pc/ucode/GenuineIntel/00050654-10=platform/i86pc/ucode/GenuineIntel/00050654-01
+h platform/i86pc/ucode/GenuineIntel/00050654-20=platform/i86pc/ucode/GenuineIntel/00050654-01
+h platform/i86pc/ucode/GenuineIntel/00050654-80=platform/i86pc/ucode/GenuineIntel/00050654-01
 f platform/i86pc/ucode/GenuineIntel/00050657-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050657-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050657-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050657-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050657-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050657-20 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00050657-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/00050657-02=platform/i86pc/ucode/GenuineIntel/00050657-01
+h platform/i86pc/ucode/GenuineIntel/00050657-04=platform/i86pc/ucode/GenuineIntel/00050657-01
+h platform/i86pc/ucode/GenuineIntel/00050657-08=platform/i86pc/ucode/GenuineIntel/00050657-01
+h platform/i86pc/ucode/GenuineIntel/00050657-10=platform/i86pc/ucode/GenuineIntel/00050657-01
+h platform/i86pc/ucode/GenuineIntel/00050657-20=platform/i86pc/ucode/GenuineIntel/00050657-01
+h platform/i86pc/ucode/GenuineIntel/00050657-80=platform/i86pc/ucode/GenuineIntel/00050657-01
 f platform/i86pc/ucode/GenuineIntel/00050662-10 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00050663-10 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00050664-10 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/00050665-10 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000506C2-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000506C9-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000506C9-02 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000506C9-02=platform/i86pc/ucode/GenuineIntel/000506C9-01
 f platform/i86pc/ucode/GenuineIntel/000506CA-01 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000506CA-02 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000506CA-02=platform/i86pc/ucode/GenuineIntel/000506CA-01
 f platform/i86pc/ucode/GenuineIntel/000506E3-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000506E3-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000506E3-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000506E3-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000506E3-04=platform/i86pc/ucode/GenuineIntel/000506E3-02
+h platform/i86pc/ucode/GenuineIntel/000506E3-10=platform/i86pc/ucode/GenuineIntel/000506E3-02
+h platform/i86pc/ucode/GenuineIntel/000506E3-20=platform/i86pc/ucode/GenuineIntel/000506E3-02
 f platform/i86pc/ucode/GenuineIntel/000506F1-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000706A1-01 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000806E9-10 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000806E9-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000806E9-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000806E9-80=platform/i86pc/ucode/GenuineIntel/000806E9-40
 f platform/i86pc/ucode/GenuineIntel/000806EA-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000806EA-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000806EA-80=platform/i86pc/ucode/GenuineIntel/000806EA-40
 f platform/i86pc/ucode/GenuineIntel/000806EB-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000806EB-40 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000806EB-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000806EB-40=platform/i86pc/ucode/GenuineIntel/000806EB-10
+h platform/i86pc/ucode/GenuineIntel/000806EB-80=platform/i86pc/ucode/GenuineIntel/000806EB-10
 f platform/i86pc/ucode/GenuineIntel/000806EC-04 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000806EC-10 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000806EC-80 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000806EC-10=platform/i86pc/ucode/GenuineIntel/000806EC-04
+h platform/i86pc/ucode/GenuineIntel/000806EC-80=platform/i86pc/ucode/GenuineIntel/000806EC-04
 f platform/i86pc/ucode/GenuineIntel/000906E9-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000906E9-08 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000906E9-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000906E9-08=platform/i86pc/ucode/GenuineIntel/000906E9-02
+h platform/i86pc/ucode/GenuineIntel/000906E9-20=platform/i86pc/ucode/GenuineIntel/000906E9-02
 f platform/i86pc/ucode/GenuineIntel/000906EA-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000906EA-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000906EA-20=platform/i86pc/ucode/GenuineIntel/000906EA-02
 f platform/i86pc/ucode/GenuineIntel/000906EB-02 0444 root sys
 f platform/i86pc/ucode/GenuineIntel/000906EC-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000906EC-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000906EC-20=platform/i86pc/ucode/GenuineIntel/000906EC-02
 f platform/i86pc/ucode/GenuineIntel/000906ED-02 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/000906ED-20 0444 root sys
+h platform/i86pc/ucode/GenuineIntel/000906ED-20=platform/i86pc/ucode/GenuineIntel/000906ED-02
 d proc 0755 root root
 d root 0755 root root
 f root/.bash_profile 0644 root root
@@ -5735,8 +5726,8 @@ f usr/lib/fm/fmd/fmd 0555 root bin
 f usr/lib/fm/fmd/fminject 0555 root bin
 f usr/lib/fm/fmd/fmsim 0555 root bin
 f usr/lib/fm/fmd/fmtopo 0555 root bin
-f usr/lib/fm/fmd/mcdecode 0555 root bin
 f usr/lib/fm/fmd/ipmitopo 0555 root bin
+f usr/lib/fm/fmd/mcdecode 0555 root bin
 d usr/lib/fm/fmd/plugins 0755 root bin
 f usr/lib/fm/fmd/plugins/cpumem-retire.conf 0644 root bin
 f usr/lib/fm/fmd/plugins/cpumem-retire.so 0555 root bin
@@ -6950,6 +6941,14 @@ f usr/lib/link_audit/truss.so.1 0755 root bin
 f usr/lib/link_audit/who.so.1 0755 root bin
 d usr/lib/locale 0755 root bin
 d usr/lib/locale/C 0755 root bin
+d usr/lib/locale/C.UTF-8 0755 root bin
+d usr/lib/locale/C.UTF-8/LC_COLLATE 0755 root bin
+d usr/lib/locale/C.UTF-8/LC_CTYPE 0755 root bin
+f usr/lib/locale/C.UTF-8/LC_CTYPE/LCL_DATA 0444 root bin
+d usr/lib/locale/C.UTF-8/LC_MESSAGES 0755 root bin
+d usr/lib/locale/C.UTF-8/LC_MONETARY 0755 root bin
+d usr/lib/locale/C.UTF-8/LC_NUMERIC 0755 root bin
+d usr/lib/locale/C.UTF-8/LC_TIME 0755 root bin
 d usr/lib/locale/C/LC_COLLATE 0755 root bin
 d usr/lib/locale/C/LC_CTYPE 0755 root bin
 d usr/lib/locale/C/LC_MESSAGES 0755 root bin
@@ -7004,14 +7003,6 @@ d usr/lib/locale/C/LC_MONETARY 0755 root bin
 d usr/lib/locale/C/LC_NUMERIC 0755 root bin
 d usr/lib/locale/C/LC_TIME 0755 root bin
 f usr/lib/locale/C/LC_TIME/SUNW_OST_OSCMD.po 0644 root bin
-d usr/lib/locale/C.UTF-8 0755 root bin
-d usr/lib/locale/C.UTF-8/LC_COLLATE 0755 root bin
-d usr/lib/locale/C.UTF-8/LC_CTYPE 0755 root bin
-f usr/lib/locale/C.UTF-8/LC_CTYPE/LCL_DATA 0444 root bin
-d usr/lib/locale/C.UTF-8/LC_MESSAGES 0755 root bin
-d usr/lib/locale/C.UTF-8/LC_MONETARY 0755 root bin
-d usr/lib/locale/C.UTF-8/LC_NUMERIC 0755 root bin
-d usr/lib/locale/C.UTF-8/LC_TIME 0755 root bin
 s usr/lib/locale/POSIX=C
 d usr/lib/locale/af_ZA.UTF-8 0755 root bin
 d usr/lib/locale/af_ZA.UTF-8/LC_COLLATE 0755 root bin
@@ -12537,8 +12528,8 @@ f usr/share/man/man1m/rcapadm.1m 0444 root bin
 f usr/share/man/man1m/rcapd.1m 0444 root bin
 f usr/share/man/man1m/rctladm.1m 0444 root bin
 f usr/share/man/man1m/rdate.1m 0444 root bin
-f usr/share/man/man1m/rdmsr.1m 0444 root bin
 s usr/share/man/man1m/rdisc.1m=in.rdisc.1m
+f usr/share/man/man1m/rdmsr.1m 0444 root bin
 f usr/share/man/man1m/reboot.1m 0444 root bin
 f usr/share/man/man1m/rem_drv.1m 0444 root bin
 f usr/share/man/man1m/repquota.1m 0444 root bin
@@ -19251,8 +19242,8 @@ f usr/share/man/man7d/blkdev.7d 0444 root bin
 f usr/share/man/man7d/bnxe.7d 0444 root bin
 f usr/share/man/man7d/chxge.7d 0444 root bin
 f usr/share/man/man7d/cmdk.7d 0444 root bin
-f usr/share/man/man7d/cpqary3.7d 0444 root bin
 f usr/share/man/man7d/coretemp.7d 0444 root bin
+f usr/share/man/man7d/cpqary3.7d 0444 root bin
 f usr/share/man/man7d/cpuid.7d 0444 root bin
 f usr/share/man/man7d/devinfo.7d 0444 root bin
 f usr/share/man/man7d/dmfe.7d 0444 root bin
@@ -20193,16 +20184,16 @@ s usr/share/man/man9f/ddi_taskq_wait.9f=taskq.9f
 s usr/share/man/man9f/ddi_trigger_softintr.9f=ddi_add_softintr.9f
 f usr/share/man/man9f/ddi_ufm.9f 0444 root bin
 s usr/share/man/man9f/ddi_ufm_fini.9f=ddi_ufm.9f
-s usr/share/man/man9f/ddi_ufm_init.9f=ddi_ufm.9f
-s usr/share/man/man9f/ddi_ufm_update.9f=ddi_ufm.9f
 f usr/share/man/man9f/ddi_ufm_image.9f 0444 root bin
 s usr/share/man/man9f/ddi_ufm_image_set_desc.9f=ddi_ufm_image.9f
 s usr/share/man/man9f/ddi_ufm_image_set_misc.9f=ddi_ufm_image.9f
 s usr/share/man/man9f/ddi_ufm_image_set_nslots.9f=ddi_ufm_image.9f
+s usr/share/man/man9f/ddi_ufm_init.9f=ddi_ufm.9f
 f usr/share/man/man9f/ddi_ufm_slot.9f 0444 root bin
 s usr/share/man/man9f/ddi_ufm_slot_set_attrs.9f=ddi_ufm_slot.9f
 s usr/share/man/man9f/ddi_ufm_slot_set_misc.9f=ddi_ufm_slot.9f
 s usr/share/man/man9f/ddi_ufm_slot_set_version.9f=ddi_ufm_slot.9f
+s usr/share/man/man9f/ddi_ufm_update.9f=ddi_ufm.9f
 f usr/share/man/man9f/ddi_umem_alloc.9f 0444 root bin
 s usr/share/man/man9f/ddi_umem_free.9f=ddi_umem_alloc.9f
 f usr/share/man/man9f/ddi_umem_iosetup.9f 0444 root bin
diff --git a/usr/src/data/ucode/Makefile b/usr/src/data/ucode/Makefile
index 5851f3407e..6b311b0d30 100644
--- a/usr/src/data/ucode/Makefile
+++ b/usr/src/data/ucode/Makefile
@@ -10,11 +10,7 @@
 #
 
 #
-<<<<<<< HEAD
-# Copyright (c) 2018, Joyent, Inc.
-=======
 # Copyright 2019 Joyent, Inc.
->>>>>>> 7284664a1faa361af4ff33ba5435d43d3ee07bf2
 #
 
 include	$(SRC)/data/Makefile.data
@@ -25,28 +21,18 @@ ROOTINTELDIR = $(ROOTUCODEPATH)/GenuineIntel
 
 AMD_FILES :sh= (cd amd; print *)
 INTEL_FILES :sh= (cd intel; print *)
-<<<<<<< HEAD
-
-ROOTAMDFILES = $(AMD_FILES:%=$(ROOTAMDDIR)/%)
-ROOTINTELFILES = $(INTEL_FILES:%=$(ROOTINTELDIR)/%)
-=======
 include $(SRC)/data/ucode/Makefile.links
 
 ROOTAMDFILES = $(AMD_FILES:%=$(ROOTAMDDIR)/%)
 ROOTINTELFILES = $(INTEL_FILES:%=$(ROOTINTELDIR)/%)
 ROOTINTELLINKS = $(INTEL_LINKS:%=$(ROOTINTELDIR)/%)
->>>>>>> 7284664a1faa361af4ff33ba5435d43d3ee07bf2
 
 $(ROOTAMDFILES) := FILEMODE = 444
 $(ROOTINTELFILES) := FILEMODE = 444
 
 all:
 
-<<<<<<< HEAD
-install: $(ROOTAMDFILES) $(ROOTINTELFILES)
-=======
 install: $(ROOTAMDFILES) $(ROOTINTELFILES) $(ROOTINTELLINKS)
->>>>>>> 7284664a1faa361af4ff33ba5435d43d3ee07bf2
 
 clean:
 
diff --git a/usr/src/data/ucode/README.ucode b/usr/src/data/ucode/README.ucode
index 8c57971099..2968fc5ec5 100644
--- a/usr/src/data/ucode/README.ucode
+++ b/usr/src/data/ucode/README.ucode
@@ -27,12 +27,6 @@ Intead of using this method, we will update the microcode and manage
 them in here as individual files. When updating files, please indicate
 the release that the microcode was obtained from here.
 
-<<<<<<< HEAD
-AMD: Updated in March 2012 as part of illumos#2546. Exact revision
-unknown.
-
-Intel: Linux 20190514 release
-=======
 The upstream microcode for Intel can currently be found at:
 
 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files
@@ -45,4 +39,3 @@ AMD: Updated in March 2012 as part of illumos#2546. Exact revision
 unknown.
 
 Intel: Linux 20190918 release
->>>>>>> 7284664a1faa361af4ff33ba5435d43d3ee07bf2
diff --git a/usr/src/data/ucode/intel/00000F32-04 b/usr/src/data/ucode/intel/00000F32-04
deleted file mode 100644
index 00271ee25e..0000000000
--- a/usr/src/data/ucode/intel/00000F32-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F32-08 b/usr/src/data/ucode/intel/00000F32-08
deleted file mode 100644
index 00271ee25e..0000000000
--- a/usr/src/data/ucode/intel/00000F32-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F33-04 b/usr/src/data/ucode/intel/00000F33-04
deleted file mode 100644
index 10300a2bb9..0000000000
--- a/usr/src/data/ucode/intel/00000F33-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F33-08 b/usr/src/data/ucode/intel/00000F33-08
deleted file mode 100644
index 10300a2bb9..0000000000
--- a/usr/src/data/ucode/intel/00000F33-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F34-04 b/usr/src/data/ucode/intel/00000F34-04
deleted file mode 100644
index 27f2b9b27f..0000000000
--- a/usr/src/data/ucode/intel/00000F34-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F34-08 b/usr/src/data/ucode/intel/00000F34-08
deleted file mode 100644
index 27f2b9b27f..0000000000
--- a/usr/src/data/ucode/intel/00000F34-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F34-10 b/usr/src/data/ucode/intel/00000F34-10
deleted file mode 100644
index 27f2b9b27f..0000000000
--- a/usr/src/data/ucode/intel/00000F34-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F41-04 b/usr/src/data/ucode/intel/00000F41-04
deleted file mode 100644
index 2eeb60c67c..0000000000
--- a/usr/src/data/ucode/intel/00000F41-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F41-08 b/usr/src/data/ucode/intel/00000F41-08
deleted file mode 100644
index 2eeb60c67c..0000000000
--- a/usr/src/data/ucode/intel/00000F41-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F41-10 b/usr/src/data/ucode/intel/00000F41-10
deleted file mode 100644
index 2eeb60c67c..0000000000
--- a/usr/src/data/ucode/intel/00000F41-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F41-20 b/usr/src/data/ucode/intel/00000F41-20
deleted file mode 100644
index 2eeb60c67c..0000000000
--- a/usr/src/data/ucode/intel/00000F41-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F41-80 b/usr/src/data/ucode/intel/00000F41-80
deleted file mode 100644
index 2eeb60c67c..0000000000
--- a/usr/src/data/ucode/intel/00000F41-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F43-04 b/usr/src/data/ucode/intel/00000F43-04
deleted file mode 100644
index 0ed7e18fd7..0000000000
--- a/usr/src/data/ucode/intel/00000F43-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F43-08 b/usr/src/data/ucode/intel/00000F43-08
deleted file mode 100644
index 0ed7e18fd7..0000000000
--- a/usr/src/data/ucode/intel/00000F43-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F43-10 b/usr/src/data/ucode/intel/00000F43-10
deleted file mode 100644
index 0ed7e18fd7..0000000000
--- a/usr/src/data/ucode/intel/00000F43-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F43-80 b/usr/src/data/ucode/intel/00000F43-80
deleted file mode 100644
index 0ed7e18fd7..0000000000
--- a/usr/src/data/ucode/intel/00000F43-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F44-04 b/usr/src/data/ucode/intel/00000F44-04
deleted file mode 100644
index 669f65966c..0000000000
--- a/usr/src/data/ucode/intel/00000F44-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F44-08 b/usr/src/data/ucode/intel/00000F44-08
deleted file mode 100644
index 669f65966c..0000000000
--- a/usr/src/data/ucode/intel/00000F44-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F44-10 b/usr/src/data/ucode/intel/00000F44-10
deleted file mode 100644
index 669f65966c..0000000000
--- a/usr/src/data/ucode/intel/00000F44-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F44-80 b/usr/src/data/ucode/intel/00000F44-80
deleted file mode 100644
index 669f65966c..0000000000
--- a/usr/src/data/ucode/intel/00000F44-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F47-04 b/usr/src/data/ucode/intel/00000F47-04
deleted file mode 100644
index 0d2190c32c..0000000000
--- a/usr/src/data/ucode/intel/00000F47-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F47-08 b/usr/src/data/ucode/intel/00000F47-08
deleted file mode 100644
index 0d2190c32c..0000000000
--- a/usr/src/data/ucode/intel/00000F47-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F47-10 b/usr/src/data/ucode/intel/00000F47-10
deleted file mode 100644
index 0d2190c32c..0000000000
--- a/usr/src/data/ucode/intel/00000F47-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F47-80 b/usr/src/data/ucode/intel/00000F47-80
deleted file mode 100644
index 0d2190c32c..0000000000
--- a/usr/src/data/ucode/intel/00000F47-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F48-08 b/usr/src/data/ucode/intel/00000F48-08
deleted file mode 100644
index 8e0a1fb8f2..0000000000
--- a/usr/src/data/ucode/intel/00000F48-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F48-10 b/usr/src/data/ucode/intel/00000F48-10
deleted file mode 100644
index 8e0a1fb8f2..0000000000
--- a/usr/src/data/ucode/intel/00000F48-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F48-40 b/usr/src/data/ucode/intel/00000F48-40
deleted file mode 100644
index 8e0a1fb8f2..0000000000
--- a/usr/src/data/ucode/intel/00000F48-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F49-04 b/usr/src/data/ucode/intel/00000F49-04
deleted file mode 100644
index 3307178dfb..0000000000
--- a/usr/src/data/ucode/intel/00000F49-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F49-08 b/usr/src/data/ucode/intel/00000F49-08
deleted file mode 100644
index 3307178dfb..0000000000
--- a/usr/src/data/ucode/intel/00000F49-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F49-10 b/usr/src/data/ucode/intel/00000F49-10
deleted file mode 100644
index 3307178dfb..0000000000
--- a/usr/src/data/ucode/intel/00000F49-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F49-20 b/usr/src/data/ucode/intel/00000F49-20
deleted file mode 100644
index 3307178dfb..0000000000
--- a/usr/src/data/ucode/intel/00000F49-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F49-80 b/usr/src/data/ucode/intel/00000F49-80
deleted file mode 100644
index 3307178dfb..0000000000
--- a/usr/src/data/ucode/intel/00000F49-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F4A-08 b/usr/src/data/ucode/intel/00000F4A-08
deleted file mode 100644
index f788f5e404..0000000000
--- a/usr/src/data/ucode/intel/00000F4A-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F4A-10 b/usr/src/data/ucode/intel/00000F4A-10
deleted file mode 100644
index f788f5e404..0000000000
--- a/usr/src/data/ucode/intel/00000F4A-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F4A-40 b/usr/src/data/ucode/intel/00000F4A-40
deleted file mode 100644
index f788f5e404..0000000000
--- a/usr/src/data/ucode/intel/00000F4A-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F64-10 b/usr/src/data/ucode/intel/00000F64-10
deleted file mode 100644
index 30c70da5ba..0000000000
--- a/usr/src/data/ucode/intel/00000F64-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F64-20 b/usr/src/data/ucode/intel/00000F64-20
deleted file mode 100644
index 30c70da5ba..0000000000
--- a/usr/src/data/ucode/intel/00000F64-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00000F68-20 b/usr/src/data/ucode/intel/00000F68-20
deleted file mode 100644
index bdc81f4050..0000000000
--- a/usr/src/data/ucode/intel/00000F68-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/0001067A-10 b/usr/src/data/ucode/intel/0001067A-10
deleted file mode 100644
index 6341a6125a..0000000000
--- a/usr/src/data/ucode/intel/0001067A-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/0001067A-40 b/usr/src/data/ucode/intel/0001067A-40
deleted file mode 100644
index 5a1ae4530e..0000000000
--- a/usr/src/data/ucode/intel/0001067A-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/0001067A-80 b/usr/src/data/ucode/intel/0001067A-80
deleted file mode 100644
index aa845f7e7b..0000000000
--- a/usr/src/data/ucode/intel/0001067A-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000106A4-02 b/usr/src/data/ucode/intel/000106A4-02
deleted file mode 100644
index 4604f50e05..0000000000
--- a/usr/src/data/ucode/intel/000106A4-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000106A5-02 b/usr/src/data/ucode/intel/000106A5-02
deleted file mode 100644
index 154e08c826..0000000000
--- a/usr/src/data/ucode/intel/000106A5-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000106E5-02 b/usr/src/data/ucode/intel/000106E5-02
deleted file mode 100644
index b692f51dd2..0000000000
--- a/usr/src/data/ucode/intel/000106E5-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000106E5-10 b/usr/src/data/ucode/intel/000106E5-10
deleted file mode 100644
index b692f51dd2..0000000000
--- a/usr/src/data/ucode/intel/000106E5-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00020652-10 b/usr/src/data/ucode/intel/00020652-10
deleted file mode 100644
index f63ee5581e..0000000000
--- a/usr/src/data/ucode/intel/00020652-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00020655-10 b/usr/src/data/ucode/intel/00020655-10
deleted file mode 100644
index 06bbbc501d..0000000000
--- a/usr/src/data/ucode/intel/00020655-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00020655-80 b/usr/src/data/ucode/intel/00020655-80
deleted file mode 100644
index 06bbbc501d..0000000000
--- a/usr/src/data/ucode/intel/00020655-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206A7-10 b/usr/src/data/ucode/intel/000206A7-10
deleted file mode 100644
index 844fc1fdb8..0000000000
--- a/usr/src/data/ucode/intel/000206A7-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206C2-02 b/usr/src/data/ucode/intel/000206C2-02
deleted file mode 100644
index 2a78b4a4d2..0000000000
--- a/usr/src/data/ucode/intel/000206C2-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206D6-01 b/usr/src/data/ucode/intel/000206D6-01
index d89a291172..2c9b69c74d 100644
--- a/usr/src/data/ucode/intel/000206D6-01
+++ b/usr/src/data/ucode/intel/000206D6-01
diff --git a/usr/src/data/ucode/intel/000206D6-04 b/usr/src/data/ucode/intel/000206D6-04
deleted file mode 100644
index d89a291172..0000000000
--- a/usr/src/data/ucode/intel/000206D6-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206D6-08 b/usr/src/data/ucode/intel/000206D6-08
deleted file mode 100644
index d89a291172..0000000000
--- a/usr/src/data/ucode/intel/000206D6-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206D6-20 b/usr/src/data/ucode/intel/000206D6-20
deleted file mode 100644
index d89a291172..0000000000
--- a/usr/src/data/ucode/intel/000206D6-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206D6-40 b/usr/src/data/ucode/intel/000206D6-40
deleted file mode 100644
index d89a291172..0000000000
--- a/usr/src/data/ucode/intel/000206D6-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206D7-01 b/usr/src/data/ucode/intel/000206D7-01
index 0da2b9e3f5..52a3fb66f3 100644
--- a/usr/src/data/ucode/intel/000206D7-01
+++ b/usr/src/data/ucode/intel/000206D7-01
diff --git a/usr/src/data/ucode/intel/000206D7-04 b/usr/src/data/ucode/intel/000206D7-04
deleted file mode 100644
index 0da2b9e3f5..0000000000
--- a/usr/src/data/ucode/intel/000206D7-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206D7-08 b/usr/src/data/ucode/intel/000206D7-08
deleted file mode 100644
index 0da2b9e3f5..0000000000
--- a/usr/src/data/ucode/intel/000206D7-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206D7-20 b/usr/src/data/ucode/intel/000206D7-20
deleted file mode 100644
index 0da2b9e3f5..0000000000
--- a/usr/src/data/ucode/intel/000206D7-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206D7-40 b/usr/src/data/ucode/intel/000206D7-40
deleted file mode 100644
index 0da2b9e3f5..0000000000
--- a/usr/src/data/ucode/intel/000206D7-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000206F2-04 b/usr/src/data/ucode/intel/000206F2-04
deleted file mode 100644
index 8cebe97f86..0000000000
--- a/usr/src/data/ucode/intel/000206F2-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306A9-10 b/usr/src/data/ucode/intel/000306A9-10
deleted file mode 100644
index 896e410ca9..0000000000
--- a/usr/src/data/ucode/intel/000306A9-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306C3-10 b/usr/src/data/ucode/intel/000306C3-10
deleted file mode 100644
index a6c51f0c29..0000000000
--- a/usr/src/data/ucode/intel/000306C3-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306C3-20 b/usr/src/data/ucode/intel/000306C3-20
deleted file mode 100644
index a6c51f0c29..0000000000
--- a/usr/src/data/ucode/intel/000306C3-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306D4-40 b/usr/src/data/ucode/intel/000306D4-40
index 36c954116a..ec79c714d3 100644
--- a/usr/src/data/ucode/intel/000306D4-40
+++ b/usr/src/data/ucode/intel/000306D4-40
diff --git a/usr/src/data/ucode/intel/000306D4-80 b/usr/src/data/ucode/intel/000306D4-80
deleted file mode 100644
index 36c954116a..0000000000
--- a/usr/src/data/ucode/intel/000306D4-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E4-04 b/usr/src/data/ucode/intel/000306E4-04
deleted file mode 100644
index b60f219ea3..0000000000
--- a/usr/src/data/ucode/intel/000306E4-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E4-08 b/usr/src/data/ucode/intel/000306E4-08
deleted file mode 100644
index b60f219ea3..0000000000
--- a/usr/src/data/ucode/intel/000306E4-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E4-20 b/usr/src/data/ucode/intel/000306E4-20
deleted file mode 100644
index b60f219ea3..0000000000
--- a/usr/src/data/ucode/intel/000306E4-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E4-40 b/usr/src/data/ucode/intel/000306E4-40
deleted file mode 100644
index b60f219ea3..0000000000
--- a/usr/src/data/ucode/intel/000306E4-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E4-80 b/usr/src/data/ucode/intel/000306E4-80
deleted file mode 100644
index b60f219ea3..0000000000
--- a/usr/src/data/ucode/intel/000306E4-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E6-04 b/usr/src/data/ucode/intel/000306E6-04
deleted file mode 100644
index 41b2d07cd3..0000000000
--- a/usr/src/data/ucode/intel/000306E6-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E6-08 b/usr/src/data/ucode/intel/000306E6-08
deleted file mode 100644
index 41b2d07cd3..0000000000
--- a/usr/src/data/ucode/intel/000306E6-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E6-20 b/usr/src/data/ucode/intel/000306E6-20
deleted file mode 100644
index 41b2d07cd3..0000000000
--- a/usr/src/data/ucode/intel/000306E6-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E6-40 b/usr/src/data/ucode/intel/000306E6-40
deleted file mode 100644
index 41b2d07cd3..0000000000
--- a/usr/src/data/ucode/intel/000306E6-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E6-80 b/usr/src/data/ucode/intel/000306E6-80
deleted file mode 100644
index 41b2d07cd3..0000000000
--- a/usr/src/data/ucode/intel/000306E6-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E7-04 b/usr/src/data/ucode/intel/000306E7-04
deleted file mode 100644
index 21a97de3e5..0000000000
--- a/usr/src/data/ucode/intel/000306E7-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E7-08 b/usr/src/data/ucode/intel/000306E7-08
deleted file mode 100644
index 21a97de3e5..0000000000
--- a/usr/src/data/ucode/intel/000306E7-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E7-20 b/usr/src/data/ucode/intel/000306E7-20
deleted file mode 100644
index 21a97de3e5..0000000000
--- a/usr/src/data/ucode/intel/000306E7-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E7-40 b/usr/src/data/ucode/intel/000306E7-40
deleted file mode 100644
index 21a97de3e5..0000000000
--- a/usr/src/data/ucode/intel/000306E7-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306E7-80 b/usr/src/data/ucode/intel/000306E7-80
deleted file mode 100644
index 21a97de3e5..0000000000
--- a/usr/src/data/ucode/intel/000306E7-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306F2-02 b/usr/src/data/ucode/intel/000306F2-02
deleted file mode 100644
index 8445583922..0000000000
--- a/usr/src/data/ucode/intel/000306F2-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306F2-04 b/usr/src/data/ucode/intel/000306F2-04
deleted file mode 100644
index 8445583922..0000000000
--- a/usr/src/data/ucode/intel/000306F2-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306F2-08 b/usr/src/data/ucode/intel/000306F2-08
deleted file mode 100644
index 8445583922..0000000000
--- a/usr/src/data/ucode/intel/000306F2-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306F2-20 b/usr/src/data/ucode/intel/000306F2-20
deleted file mode 100644
index 8445583922..0000000000
--- a/usr/src/data/ucode/intel/000306F2-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306F2-40 b/usr/src/data/ucode/intel/000306F2-40
deleted file mode 100644
index 8445583922..0000000000
--- a/usr/src/data/ucode/intel/000306F2-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000306F4-80 b/usr/src/data/ucode/intel/000306F4-80
index c373a6824d..2cdbb7c270 100644
--- a/usr/src/data/ucode/intel/000306F4-80
+++ b/usr/src/data/ucode/intel/000306F4-80
diff --git a/usr/src/data/ucode/intel/00040651-10 b/usr/src/data/ucode/intel/00040651-10
deleted file mode 100644
index f93f80134b..0000000000
--- a/usr/src/data/ucode/intel/00040651-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00040651-20 b/usr/src/data/ucode/intel/00040651-20
deleted file mode 100644
index f93f80134b..0000000000
--- a/usr/src/data/ucode/intel/00040651-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00040651-40 b/usr/src/data/ucode/intel/00040651-40
deleted file mode 100644
index f93f80134b..0000000000
--- a/usr/src/data/ucode/intel/00040651-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00040661-10 b/usr/src/data/ucode/intel/00040661-10
deleted file mode 100644
index d2d8fb5f8a..0000000000
--- a/usr/src/data/ucode/intel/00040661-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00040661-20 b/usr/src/data/ucode/intel/00040661-20
deleted file mode 100644
index d2d8fb5f8a..0000000000
--- a/usr/src/data/ucode/intel/00040661-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00040671-02 b/usr/src/data/ucode/intel/00040671-02
index 2d9be24fd1..939c1e93c4 100644
--- a/usr/src/data/ucode/intel/00040671-02
+++ b/usr/src/data/ucode/intel/00040671-02
diff --git a/usr/src/data/ucode/intel/00040671-20 b/usr/src/data/ucode/intel/00040671-20
deleted file mode 100644
index 2d9be24fd1..0000000000
--- a/usr/src/data/ucode/intel/00040671-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000406E3-80 b/usr/src/data/ucode/intel/000406E3-80
deleted file mode 100644
index 8f7afa6efd..0000000000
--- a/usr/src/data/ucode/intel/000406E3-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000406F1-01 b/usr/src/data/ucode/intel/000406F1-01
index c524aec9c8..b38c4a5cc5 100644
--- a/usr/src/data/ucode/intel/000406F1-01
+++ b/usr/src/data/ucode/intel/000406F1-01
diff --git a/usr/src/data/ucode/intel/000406F1-02 b/usr/src/data/ucode/intel/000406F1-02
deleted file mode 100644
index c524aec9c8..0000000000
--- a/usr/src/data/ucode/intel/000406F1-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000406F1-04 b/usr/src/data/ucode/intel/000406F1-04
deleted file mode 100644
index c524aec9c8..0000000000
--- a/usr/src/data/ucode/intel/000406F1-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000406F1-08 b/usr/src/data/ucode/intel/000406F1-08
deleted file mode 100644
index c524aec9c8..0000000000
--- a/usr/src/data/ucode/intel/000406F1-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000406F1-20 b/usr/src/data/ucode/intel/000406F1-20
deleted file mode 100644
index c524aec9c8..0000000000
--- a/usr/src/data/ucode/intel/000406F1-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000406F1-40 b/usr/src/data/ucode/intel/000406F1-40
deleted file mode 100644
index c524aec9c8..0000000000
--- a/usr/src/data/ucode/intel/000406F1-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000406F1-80 b/usr/src/data/ucode/intel/000406F1-80
deleted file mode 100644
index c524aec9c8..0000000000
--- a/usr/src/data/ucode/intel/000406F1-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050653-01 b/usr/src/data/ucode/intel/00050653-01
deleted file mode 100644
index e3a7b02c14..0000000000
--- a/usr/src/data/ucode/intel/00050653-01
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050653-02 b/usr/src/data/ucode/intel/00050653-02
deleted file mode 100644
index e3a7b02c14..0000000000
--- a/usr/src/data/ucode/intel/00050653-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050653-04 b/usr/src/data/ucode/intel/00050653-04
deleted file mode 100644
index e3a7b02c14..0000000000
--- a/usr/src/data/ucode/intel/00050653-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050653-10 b/usr/src/data/ucode/intel/00050653-10
deleted file mode 100644
index e3a7b02c14..0000000000
--- a/usr/src/data/ucode/intel/00050653-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050653-80 b/usr/src/data/ucode/intel/00050653-80
deleted file mode 100644
index e3a7b02c14..0000000000
--- a/usr/src/data/ucode/intel/00050653-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050654-01 b/usr/src/data/ucode/intel/00050654-01
index c0f3959412..754d08173e 100644
--- a/usr/src/data/ucode/intel/00050654-01
+++ b/usr/src/data/ucode/intel/00050654-01
diff --git a/usr/src/data/ucode/intel/00050654-02 b/usr/src/data/ucode/intel/00050654-02
deleted file mode 100644
index c0f3959412..0000000000
--- a/usr/src/data/ucode/intel/00050654-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050654-04 b/usr/src/data/ucode/intel/00050654-04
deleted file mode 100644
index c0f3959412..0000000000
--- a/usr/src/data/ucode/intel/00050654-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050654-10 b/usr/src/data/ucode/intel/00050654-10
deleted file mode 100644
index c0f3959412..0000000000
--- a/usr/src/data/ucode/intel/00050654-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050654-20 b/usr/src/data/ucode/intel/00050654-20
deleted file mode 100644
index c0f3959412..0000000000
--- a/usr/src/data/ucode/intel/00050654-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050654-80 b/usr/src/data/ucode/intel/00050654-80
deleted file mode 100644
index c0f3959412..0000000000
--- a/usr/src/data/ucode/intel/00050654-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050655-01 b/usr/src/data/ucode/intel/00050655-01
deleted file mode 100644
index 923b87da82..0000000000
--- a/usr/src/data/ucode/intel/00050655-01
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050655-02 b/usr/src/data/ucode/intel/00050655-02
deleted file mode 100644
index 923b87da82..0000000000
--- a/usr/src/data/ucode/intel/00050655-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050655-04 b/usr/src/data/ucode/intel/00050655-04
deleted file mode 100644
index 923b87da82..0000000000
--- a/usr/src/data/ucode/intel/00050655-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050655-10 b/usr/src/data/ucode/intel/00050655-10
deleted file mode 100644
index 923b87da82..0000000000
--- a/usr/src/data/ucode/intel/00050655-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050655-20 b/usr/src/data/ucode/intel/00050655-20
deleted file mode 100644
index 923b87da82..0000000000
--- a/usr/src/data/ucode/intel/00050655-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050655-80 b/usr/src/data/ucode/intel/00050655-80
deleted file mode 100644
index 923b87da82..0000000000
--- a/usr/src/data/ucode/intel/00050655-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050656-01 b/usr/src/data/ucode/intel/00050656-01
deleted file mode 100644
index 9aa09ed654..0000000000
--- a/usr/src/data/ucode/intel/00050656-01
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050656-02 b/usr/src/data/ucode/intel/00050656-02
deleted file mode 100644
index 9aa09ed654..0000000000
--- a/usr/src/data/ucode/intel/00050656-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050656-04 b/usr/src/data/ucode/intel/00050656-04
deleted file mode 100644
index 9aa09ed654..0000000000
--- a/usr/src/data/ucode/intel/00050656-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050656-08 b/usr/src/data/ucode/intel/00050656-08
deleted file mode 100644
index 9aa09ed654..0000000000
--- a/usr/src/data/ucode/intel/00050656-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050656-10 b/usr/src/data/ucode/intel/00050656-10
deleted file mode 100644
index 9aa09ed654..0000000000
--- a/usr/src/data/ucode/intel/00050656-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050656-20 b/usr/src/data/ucode/intel/00050656-20
deleted file mode 100644
index 9aa09ed654..0000000000
--- a/usr/src/data/ucode/intel/00050656-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050656-80 b/usr/src/data/ucode/intel/00050656-80
deleted file mode 100644
index 9aa09ed654..0000000000
--- a/usr/src/data/ucode/intel/00050656-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050657-01 b/usr/src/data/ucode/intel/00050657-01
index 8884c4ec91..b5e3f112a1 100644
--- a/usr/src/data/ucode/intel/00050657-01
+++ b/usr/src/data/ucode/intel/00050657-01
diff --git a/usr/src/data/ucode/intel/00050657-02 b/usr/src/data/ucode/intel/00050657-02
deleted file mode 100644
index 8884c4ec91..0000000000
--- a/usr/src/data/ucode/intel/00050657-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050657-04 b/usr/src/data/ucode/intel/00050657-04
deleted file mode 100644
index 8884c4ec91..0000000000
--- a/usr/src/data/ucode/intel/00050657-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050657-08 b/usr/src/data/ucode/intel/00050657-08
deleted file mode 100644
index 8884c4ec91..0000000000
--- a/usr/src/data/ucode/intel/00050657-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050657-10 b/usr/src/data/ucode/intel/00050657-10
deleted file mode 100644
index 8884c4ec91..0000000000
--- a/usr/src/data/ucode/intel/00050657-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050657-20 b/usr/src/data/ucode/intel/00050657-20
deleted file mode 100644
index 8884c4ec91..0000000000
--- a/usr/src/data/ucode/intel/00050657-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050657-80 b/usr/src/data/ucode/intel/00050657-80
deleted file mode 100644
index 8884c4ec91..0000000000
--- a/usr/src/data/ucode/intel/00050657-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/00050662-10 b/usr/src/data/ucode/intel/00050662-10
index 75fc81dbd1..2b4c64d027 100644
--- a/usr/src/data/ucode/intel/00050662-10
+++ b/usr/src/data/ucode/intel/00050662-10
diff --git a/usr/src/data/ucode/intel/00050663-10 b/usr/src/data/ucode/intel/00050663-10
index 387f5a4e19..37f7333bc6 100644
--- a/usr/src/data/ucode/intel/00050663-10
+++ b/usr/src/data/ucode/intel/00050663-10
diff --git a/usr/src/data/ucode/intel/00050664-10 b/usr/src/data/ucode/intel/00050664-10
index 21a6db266d..0e8fc2b5fe 100644
--- a/usr/src/data/ucode/intel/00050664-10
+++ b/usr/src/data/ucode/intel/00050664-10
diff --git a/usr/src/data/ucode/intel/00050665-10 b/usr/src/data/ucode/intel/00050665-10
index 2800d7c687..b2c17aa506 100644
--- a/usr/src/data/ucode/intel/00050665-10
+++ b/usr/src/data/ucode/intel/00050665-10
diff --git a/usr/src/data/ucode/intel/000506C9-02 b/usr/src/data/ucode/intel/000506C9-02
deleted file mode 100644
index b999fdb674..0000000000
--- a/usr/src/data/ucode/intel/000506C9-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000506CA-01 b/usr/src/data/ucode/intel/000506CA-01
index 6aaf638f96..51c83447b4 100644
--- a/usr/src/data/ucode/intel/000506CA-01
+++ b/usr/src/data/ucode/intel/000506CA-01
diff --git a/usr/src/data/ucode/intel/000506CA-02 b/usr/src/data/ucode/intel/000506CA-02
deleted file mode 100644
index 6aaf638f96..0000000000
--- a/usr/src/data/ucode/intel/000506CA-02
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000506E3-04 b/usr/src/data/ucode/intel/000506E3-04
deleted file mode 100644
index 3dfc610744..0000000000
--- a/usr/src/data/ucode/intel/000506E3-04
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000506E3-10 b/usr/src/data/ucode/intel/000506E3-10
deleted file mode 100644
index 3dfc610744..0000000000
--- a/usr/src/data/ucode/intel/000506E3-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000506E3-20 b/usr/src/data/ucode/intel/000506E3-20
deleted file mode 100644
index 3dfc610744..0000000000
--- a/usr/src/data/ucode/intel/000506E3-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000806E9-80 b/usr/src/data/ucode/intel/000806E9-80
deleted file mode 100644
index 49aea22aee..0000000000
--- a/usr/src/data/ucode/intel/000806E9-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000806EA-80 b/usr/src/data/ucode/intel/000806EA-80
deleted file mode 100644
index 20ff87c8c8..0000000000
--- a/usr/src/data/ucode/intel/000806EA-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000806EB-40 b/usr/src/data/ucode/intel/000806EB-40
deleted file mode 100644
index 9eae11d13c..0000000000
--- a/usr/src/data/ucode/intel/000806EB-40
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000806EB-80 b/usr/src/data/ucode/intel/000806EB-80
deleted file mode 100644
index 9eae11d13c..0000000000
--- a/usr/src/data/ucode/intel/000806EB-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000806EC-10 b/usr/src/data/ucode/intel/000806EC-10
deleted file mode 100644
index b0458f3abc..0000000000
--- a/usr/src/data/ucode/intel/000806EC-10
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000806EC-80 b/usr/src/data/ucode/intel/000806EC-80
deleted file mode 100644
index b0458f3abc..0000000000
--- a/usr/src/data/ucode/intel/000806EC-80
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000906E9-08 b/usr/src/data/ucode/intel/000906E9-08
deleted file mode 100644
index 51202b3fca..0000000000
--- a/usr/src/data/ucode/intel/000906E9-08
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000906E9-20 b/usr/src/data/ucode/intel/000906E9-20
deleted file mode 100644
index 51202b3fca..0000000000
--- a/usr/src/data/ucode/intel/000906E9-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000906EA-20 b/usr/src/data/ucode/intel/000906EA-20
deleted file mode 100644
index 68aafca7ed..0000000000
--- a/usr/src/data/ucode/intel/000906EA-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000906EC-20 b/usr/src/data/ucode/intel/000906EC-20
deleted file mode 100644
index 5feee15c02..0000000000
--- a/usr/src/data/ucode/intel/000906EC-20
+++ /dev/null
diff --git a/usr/src/data/ucode/intel/000906ED-20 b/usr/src/data/ucode/intel/000906ED-20
deleted file mode 100644
index b438fbddcb..0000000000
--- a/usr/src/data/ucode/intel/000906ED-20
+++ /dev/null