summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2020-02-04 12:21:37 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2020-02-04 12:21:37 +0000
commit86b01acdc561eb9c47f9d9e8c33b2d15e064aed7 (patch)
treeaee1ab58f4d6c0ab894c5d06fa3e32cf92c8714f /manifest
parentb69deb59db49c8958cbaea43a0d6bf9029f5b19e (diff)
parent8bd53a1ca9fba2d5585cc775422e4d1db161bf96 (diff)
downloadillumos-joyent-86b01acdc561eb9c47f9d9e8c33b2d15e064aed7.tar.gz
[illumos-gate merge]
commit 8bd53a1ca9fba2d5585cc775422e4d1db161bf96 12255 proc_get_fdinfo() crash if fdinfo file grows commit 8b06eaf6acc31eaadddc0fec3df9d1a4294b7cc2 12267 zfs '::abuf_find' dcmd is broken commit a52121ea720d327228a95e9d0c4a426339f08c7f 12260 Fix zpool history unbounded memory usage commit b5c83661f3899fe50c949117084b15d6478d9f5f 12251 remove sunfire-specific man pages commit 46782190b8c59b1b5fd7df81b2231ef50061fe2a 12234 Want smbios battery support commit 9a63ec2733c93e3ee31e95779a4f2f45a57eda59 12183 Want new IPD 13 DMA Cookie APIs commit 31ad075e90bf5afda8ab4b8cc4d3ca3e89946115 12257 resync smatch to 0.6.1-rc1-il-4 commit 2d85dedb8eaa3ba69c85560030efe4cbc815efb8 12245 Support inheriting properties in zfs channel programs commit 442c994cdeb1e51c84e6d7ba987af00893aa84c4 12269 mdb multilist walker should be a layered walker commit 83bba2b4a81b05183e2f81f5601e23cba9972fad 12272 loader: bc_add can not use any other probes than ah=0x4b
Diffstat (limited to 'manifest')
-rw-r--r--manifest6
1 files changed, 5 insertions, 1 deletions
diff --git a/manifest b/manifest
index 62b9854c48..5833bd27d0 100644
--- a/manifest
+++ b/manifest
@@ -20160,11 +20160,15 @@ f usr/share/man/man9f/ddi_dma_addr_bind_handle.9f 0444 root bin
f usr/share/man/man9f/ddi_dma_alloc_handle.9f 0444 root bin
f usr/share/man/man9f/ddi_dma_buf_bind_handle.9f 0444 root bin
f usr/share/man/man9f/ddi_dma_burstsizes.9f 0444 root bin
+f usr/share/man/man9f/ddi_dma_cookie_iter.9f 0444 root bin
+s usr/share/man/man9f/ddi_dma_cookie_get.9f=ddi_dma_cookie_iter.9f
+s usr/share/man/man9f/ddi_dma_cookie_one.9f=ddi_dma_cookie_iter.9f
f usr/share/man/man9f/ddi_dma_free_handle.9f 0444 root bin
f usr/share/man/man9f/ddi_dma_getwin.9f 0444 root bin
f usr/share/man/man9f/ddi_dma_mem_alloc.9f 0444 root bin
f usr/share/man/man9f/ddi_dma_mem_free.9f 0444 root bin
-f usr/share/man/man9f/ddi_dma_nextcookie.9f 0444 root bin
+s usr/share/man/man9f/ddi_dma_ncookies.9f=ddi_dma_cookie_iter.9f
+s usr/share/man/man9f/ddi_dma_nextcookie.9f=ddi_dma_cookie_iter.9f
f usr/share/man/man9f/ddi_dma_numwin.9f 0444 root bin
f usr/share/man/man9f/ddi_dma_set_sbus64.9f 0444 root bin
f usr/share/man/man9f/ddi_dma_sync.9f 0444 root bin