summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorDan McDonald <danmcd@joyent.com>2022-02-21 15:10:45 -0500
committerDan McDonald <danmcd@joyent.com>2022-02-21 15:10:45 -0500
commitebcd0fe2a47d2edd394ec05fe4e51389205135f7 (patch)
tree106db6a17d697d1a0349888ed47813747d221981 /manifest
parent6c5a782db588047b641eaac2971cdd95add02bdf (diff)
parent74e98f497ae878ae481ccba1f91fd8dc26fa6627 (diff)
downloadillumos-joyent-ebcd0fe2a47d2edd394ec05fe4e51389205135f7.tar.gz
[illumos-gate merge]
commit 74e98f497ae878ae481ccba1f91fd8dc26fa6627 14484 Update Intel microcode to 20220207 commit 501bc5c03a221e7e601a0cfa80ab0972bcf20330 14471 vioblk could raise dynamic lun expansion sysevents Conflicts: manifest
Diffstat (limited to 'manifest')
-rw-r--r--manifest2
1 files changed, 0 insertions, 2 deletions
diff --git a/manifest b/manifest
index c9d181a7ae..f80f818903 100644
--- a/manifest
+++ b/manifest
@@ -2360,8 +2360,6 @@ h platform/i86pc/ucode/GenuineIntel/000606A6-80=platform/i86pc/ucode/GenuineInte
f platform/i86pc/ucode/GenuineIntel/000706A1-01 0444 root sys
f platform/i86pc/ucode/GenuineIntel/000706A8-01 0444 root sys
f platform/i86pc/ucode/GenuineIntel/000706E5-80 0444 root sys
-f platform/i86pc/ucode/GenuineIntel/00080664-01 0444 root sys
-h platform/i86pc/ucode/GenuineIntel/00080665-01=platform/i86pc/ucode/GenuineIntel/00080664-01
f platform/i86pc/ucode/GenuineIntel/000806A1-10 0444 root sys
f platform/i86pc/ucode/GenuineIntel/000806C1-80 0444 root sys
f platform/i86pc/ucode/GenuineIntel/000806C2-02 0444 root sys