summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorDan McDonald <danmcd@mnx.io>2022-08-05 01:09:21 -0400
committerDan McDonald <danmcd@mnx.io>2022-08-05 01:09:21 -0400
commitd491608f4e80ef223b7567c7914acbf733832708 (patch)
treedb3702c2a2ba0bfe6843d5fcaa0cc19f647e65d6 /manifest
parent7214807eae5f4cd01de736a5d1c72ef382fcb622 (diff)
parent7105039931b43c4efeda411cd0527843723c90bd (diff)
downloadillumos-joyent-d491608f4e80ef223b7567c7914acbf733832708.tar.gz
[illumos-gate merge]
commit 7105039931b43c4efeda411cd0527843723c90bd 14887 audio_legacy_* prototypes can be removed commit b75a8b718b0b6c50c43b47b15603947383771a04 14873 Retire ddi_getiminor() commit 5b2c4190a831f52d91a5b92473ffb5a06e84511d 14812 pcie: properly set max packet size and tagging commit bdb5139270356ff627abb9467f2b4fc8db3fb81d 14827 overlay_m_stop() blows verify in race with overlay_target_inject() 14853 overlay_setprop_vnetid bungles OVERLAY_F_MDDROP commit 2c76d75129011c98e79463bb84917b828f922a11 13700 pollhead_delete trips over bad pointer Conflicts: manifest usr/src/uts/common/sys/overlay_impl.h usr/src/uts/common/syscall/poll.c
Diffstat (limited to 'manifest')
-rw-r--r--manifest1
1 files changed, 0 insertions, 1 deletions
diff --git a/manifest b/manifest
index 28dc242e36..6356e0c756 100644
--- a/manifest
+++ b/manifest
@@ -20423,7 +20423,6 @@ s usr/share/man/man9f/ddi_get_soft_iblock_cookie.9f=ddi_add_softintr.9f
s usr/share/man/man9f/ddi_get_soft_state.9f=ddi_soft_state.9f
f usr/share/man/man9f/ddi_get_time.9f 0444 root bin
s usr/share/man/man9f/ddi_getb.9f=ddi_get8.9f
-f usr/share/man/man9f/ddi_getiminor.9f 0444 root bin
s usr/share/man/man9f/ddi_getl.9f=ddi_get8.9f
s usr/share/man/man9f/ddi_getll.9f=ddi_get8.9f
s usr/share/man/man9f/ddi_getlongprop.9f=ddi_prop_op.9f