summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2020-01-24 11:59:07 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2020-01-24 11:59:07 +0000
commit269407a4d5b375a0218804f9e208d722257c2bb0 (patch)
treee87c071ad4fb0fa6fc10e8d3919a17b9f2fcefae /manifest
parentdf19b64eb529388a60a4bb9c4e384505e04fad49 (diff)
parent1dd4766bd0d7ab56961ce97c9c39de612ae2e7d1 (diff)
downloadillumos-joyent-269407a4d5b375a0218804f9e208d722257c2bb0.tar.gz
[illumos-gate merge]
commit 1dd4766bd0d7ab56961ce97c9c39de612ae2e7d1 12153 netstat can use /proc/<PID>/fdinfo and avoid grabbing processes commit a02120c4550735e4c33259ff2671a5ef9d06c5cc 12046 Provide /proc/<PID>/fdinfo/ commit e3bf7d5a53699b06ef4e776789b585322c4bf8ed 12189 zfs test suite calculates md5 digests suboptimally Conflicts: usr/src/uts/common/sys/prsystm.h usr/src/uts/common/fs/proc/prvnops.c
Diffstat (limited to 'manifest')
-rw-r--r--manifest4
1 files changed, 4 insertions, 0 deletions
diff --git a/manifest b/manifest
index eb07404a4e..62b9854c48 100644
--- a/manifest
+++ b/manifest
@@ -17595,6 +17595,10 @@ s usr/share/man/man3proc/proc_arg_xgrab.3proc=proc_arg_grab.3proc
s usr/share/man/man3proc/proc_arg_xpsinfo.3proc=proc_arg_psinfo.3proc
f usr/share/man/man3proc/proc_content2str.3proc 0444 root bin
s usr/share/man/man3proc/proc_dmodelname.3proc=proc_fltname.3proc
+f usr/share/man/man3proc/proc_fdinfo_misc.3proc 0444 root bin
+f usr/share/man/man3proc/proc_fdinfowalk.3proc 0444 root bin
+f usr/share/man/man3proc/proc_fdwalk.3proc 0444 root bin
+f usr/share/man/man3proc/proc_get_fdinfo.3proc 0444 root bin
s usr/share/man/man3proc/proc_finistdio.3proc=proc_initstdio.3proc
f usr/share/man/man3proc/proc_fltname.3proc 0444 root bin
f usr/share/man/man3proc/proc_fltset2str.3proc 0444 root bin