diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-02 13:20:05 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-02 13:20:05 +0000 |
| commit | e8cde0f3c5e7729d1fff5b7c87826a6650863a18 (patch) | |
| tree | 88e4f45c89a249664d35d557dfacd7f1c324b3ca /manifest | |
| parent | d6c0c21a61cacd3b34ad4c75bc7a2dc58a36a9c7 (diff) | |
| parent | 3ab8de02e091bc75fc50aafc5cbe32c053451d88 (diff) | |
| download | illumos-joyent-e8cde0f3c5e7729d1fff5b7c87826a6650863a18.tar.gz | |
[illumos-gate merge]release-20190103
commit 3ab8de02e091bc75fc50aafc5cbe32c053451d88
10164 crle: passing argument 2 to restrict-qualified parameter aliases with argument 1
commit cd8e64e261b359d5d54dad750f50660d3b874238
10161 libstand: set spa in zfs_probe
commit e88f57b4cab0ed8f8a773d404d6781e20a4c26d7
10072 ip: timeout takes void (*)(void *) as callback
commit e74ff6533275aaaa8989786dfbba24b3281e3530
10049 mboot: mboot is no longer needed
commit 7931524763ef94dc16989451dddd206563d03bb4
9689 zfs range lock code should not be zpl-specific
Conflicts:
usr/src/uts/common/fs/zfs/zvol.c
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -5770,7 +5770,6 @@ f usr/lib/fs/ufs/fstyp.so.1 0555 root bin h usr/lib/fs/ufs/fstyp=usr/sbin/fstyp f usr/lib/fs/ufs/labelit 0555 root bin f usr/lib/fs/ufs/lockfs 0555 root bin -f usr/lib/fs/ufs/mboot 0444 root sys f usr/lib/fs/ufs/mkfs 0555 root bin s usr/lib/fs/ufs/mount=../../../../etc/fs/ufs/mount f usr/lib/fs/ufs/ncheck 0555 root bin |