summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorDan McDonald <danmcd@mnx.io>2022-06-29 13:55:19 -0400
committerDan McDonald <danmcd@mnx.io>2022-06-29 13:55:19 -0400
commit7190ec3767d4ac1a525d0801318ad2b10f6824d9 (patch)
tree71a6de53ec7a82c9bde81c40d10e759f642550cd /manifest
parentfd7948755fd156e375263ea9fb2742dbf6e210bc (diff)
parent08848a83914f59a64a6b5a37f068bbb69b0604b0 (diff)
downloadillumos-joyent-7190ec3767d4ac1a525d0801318ad2b10f6824d9.tar.gz
[illumos-gate merge]release-20220630
commit 08848a83914f59a64a6b5a37f068bbb69b0604b0 13919 dladm show-vnic truncates link speed for 100Gbps commit 99e2a6f8e952fd927a72b75323d3e56bcbcda40a 14743 new vioscsi driver commit 028c45646327b08802a29b76d1abea8907a57f17 14752 AVL: Remove obsolete branching optimizations Conflicts: usr/src/cmd/dladm/dladm.c
Diffstat (limited to 'manifest')
-rw-r--r--manifest2
1 files changed, 2 insertions, 0 deletions
diff --git a/manifest b/manifest
index 3b3ebab85b..9b65edb77e 100644
--- a/manifest
+++ b/manifest
@@ -813,6 +813,7 @@ f kernel/drv/amd64/usbsprl 0755 root sys
f kernel/drv/amd64/vgatext 0755 root sys
f kernel/drv/amd64/vioblk 0755 root sys
f kernel/drv/amd64/vioif 0755 root sys
+f kernel/drv/amd64/vioscsi 0755 root sys
f kernel/drv/amd64/vmxnet 0755 root sys
f kernel/drv/amd64/vmxnet3s 0755 root sys
f kernel/drv/amd64/vnd 0755 root sys
@@ -19013,6 +19014,7 @@ f usr/share/man/man4d/usbsksp.4d 0444 root bin
f usr/share/man/man4d/usbsprl.4d 0444 root bin
f usr/share/man/man4d/vioblk.4d 0444 root bin
f usr/share/man/man4d/vioif.4d 0444 root bin
+f usr/share/man/man4d/vioscsi.4d 0444 root bin
f usr/share/man/man4d/virtio.4d 0444 root bin
f usr/share/man/man4d/virtualkm.4d 0444 root bin
f usr/share/man/man4d/vnd.4d 0444 root bin