diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-01-31 12:33:41 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-01-31 12:33:41 +0000 |
| commit | 4f85f546262f3d67c5d1d64ab4c0843d36bd91ee (patch) | |
| tree | e3e4d176a1f5c2fc7b162bb701753bf7b737aca0 /manifest | |
| parent | 9f6b3ea11dce076cf9dd9f88c85a752702938873 (diff) | |
| parent | f06dce2c1f0f3af78581e7574f65bfba843ddb6e (diff) | |
| download | illumos-joyent-4f85f546262f3d67c5d1d64ab4c0843d36bd91ee.tar.gz | |
[illumos-gate merge]
commit f06dce2c1f0f3af78581e7574f65bfba843ddb6e
8809 libzpool should leverage work done in libfakekernel
commit 0fb055e81fd0cda5221da8ddd98b2f8d1fc6bdbe
8969 Cannot boot from RAIDZ with parity > 1
Conflicts:
usr/src/lib/libzpool/common/sys/zfs_context.h
usr/src/lib/libzpool/common/taskq.c (deleted)
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1209,6 +1209,7 @@ f lib/amd64/libefi.so.1 0755 root bin s lib/amd64/libefi.so=libefi.so.1 f lib/amd64/libelf.so.1 0755 root bin s lib/amd64/libelf.so=libelf.so.1 +f lib/amd64/libfakekernel.so.1 0755 root bin f lib/amd64/libfdisk.so.1 0755 root bin s lib/amd64/libfdisk.so=libfdisk.so.1 f lib/amd64/libgen.so.1 0755 root bin @@ -1397,6 +1398,7 @@ f lib/libelf.so.1 0755 root bin s lib/libelf.so=libelf.so.1 f lib/libelfsign.so.1 0755 root bin s lib/libelfsign.so=libelfsign.so.1 +f lib/libfakekernel.so.1 0755 root bin f lib/libfdisk.so.1 0755 root bin s lib/libfdisk.so=libfdisk.so.1 f lib/libgen.so.1 0755 root bin @@ -4817,6 +4819,7 @@ s usr/lib/amd64/libelf.so.1=../../../lib/amd64/libelf.so.1 s usr/lib/amd64/libelf.so=../../../lib/amd64/libelf.so.1 f usr/lib/amd64/libexacct.so.1 0755 root bin s usr/lib/amd64/libexacct.so=libexacct.so.1 +s usr/lib/amd64/libfakekernel.so.1=../../../lib/amd64/libfakekernel.so.1 f usr/lib/amd64/libfcoe.so.1 0755 root bin s usr/lib/amd64/libfcoe.so=libfcoe.so.1 s usr/lib/amd64/libfdisk.so.1=../../../lib/amd64/libfdisk.so.1 @@ -6219,6 +6222,7 @@ s usr/lib/libelfsign.so.1=../../lib/libelfsign.so.1 s usr/lib/libelfsign.so=../../lib/libelfsign.so.1 f usr/lib/libexacct.so.1 0755 root bin s usr/lib/libexacct.so=libexacct.so.1 +s usr/lib/libfakekernel.so.1=../../../lib/libfakekernel.so.1 f usr/lib/libfcoe.so.1 0755 root bin s usr/lib/libfcoe.so=libfcoe.so.1 s usr/lib/libfdisk.so.1=../../lib/libfdisk.so.1 |