diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-04-24 12:05:06 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-04-24 12:05:06 +0000 |
| commit | fbe38b28735cd7e7715a61f2d1066dbbf1327b5c (patch) | |
| tree | 82b5600384e40993ef24fee34a90e234f4520c7f /usr/src/pkg | |
| parent | 6f1d54d1657b9c469ae08d5ee733e114fe36c690 (diff) | |
| parent | ff7af0d3beb1bddf8bb93afc2e9042dc3828be3d (diff) | |
| download | illumos-joyent-fbe38b28735cd7e7715a61f2d1066dbbf1327b5c.tar.gz | |
[illumos-gate merge]
commit ff7af0d3beb1bddf8bb93afc2e9042dc3828be3d
8007 want sys/stddef.h for offsetof and container_of macros
commit 63982b82e639bf9f496423925738dd3f86bda7aa
7976 libstand/dosfs: cache FAT32 in 128 Kb blocks to save loader memory
commit f289ce6eb03db0584699ec4fed88ef795a33dd79
7839 uts: implement boot environment support
commit 76608ff7a54afda798e7fdc98681fb6d37322109
7838 loader: pass loader environment to kernel as module
commit 14ee0d29c415966483c8c602b05bf27669c29497
7462 loader should support multiboot2 protocol
commit 1738dd6ec94e36a9828d13a6e52ac7fb68cb52ed
7461 illumos should support multiboot2 protocol
commit 660946868929e02041af7b5b1c3e14f547c53f11
8021 ARC buf data scatter-ization
commit df950592be5771afa05177cbbef90ff275f2526f
8088 Add support for LSI Intruder and Cutlass cards.
Conflicts:
usr/src/uts/common/fs/zfs/arc.c
Diffstat (limited to 'usr/src/pkg')
| -rw-r--r-- | usr/src/pkg/manifests/driver-storage-mr_sas.mf | 13 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-header.mf | 1 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-test-zfstest.mf | 9 |
3 files changed, 19 insertions, 4 deletions
diff --git a/usr/src/pkg/manifests/driver-storage-mr_sas.mf b/usr/src/pkg/manifests/driver-storage-mr_sas.mf index 32a138a184..d1b39a659e 100644 --- a/usr/src/pkg/manifests/driver-storage-mr_sas.mf +++ b/usr/src/pkg/manifests/driver-storage-mr_sas.mf @@ -23,6 +23,7 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2013 Nexenta Systems, Inc. All rights reserved. # Copyright 2015 Garrett D'Amore <garrett@damore.org> +# Copyright 2017 Citrus IT Limited. All rights reserved. # # @@ -45,21 +46,29 @@ dir path=usr/share/man/man7d $(sparc_ONLY)driver name=mr_sas class=scsi-self-identifying \ alias=pci1000,78 \ alias=pci1000,79 \ + alias=pciex1000,52 \ + alias=pciex1000,53 \ alias=pciex1000,5b \ alias=pciex1000,5d \ alias=pciex1000,5f \ alias=pciex1000,71 \ alias=pciex1000,73 \ alias=pciex1000,78 \ - alias=pciex1000,79 + alias=pciex1000,79 \ + alias=pciex1000,ce \ + alias=pciex1000,cf $(i386_ONLY)driver name=mr_sas class=scsi-self-identifying \ + alias=pciex1000,52 \ + alias=pciex1000,53 \ alias=pciex1000,5b \ alias=pciex1000,5d \ alias=pciex1000,5f \ alias=pciex1000,71 \ alias=pciex1000,73 \ alias=pciex1000,78 \ - alias=pciex1000,79 + alias=pciex1000,79 \ + alias=pciex1000,ce \ + alias=pciex1000,cf file path=kernel/drv/$(ARCH64)/mr_sas group=sys $(i386_ONLY)file path=kernel/drv/mr_sas group=sys file path=kernel/drv/mr_sas.conf group=sys diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf index 7fec376963..4e135e7751 100644 --- a/usr/src/pkg/manifests/system-header.mf +++ b/usr/src/pkg/manifests/system-header.mf @@ -1433,6 +1433,7 @@ file path=usr/include/sys/stat_impl.h file path=usr/include/sys/statfs.h file path=usr/include/sys/statvfs.h file path=usr/include/sys/stdbool.h +file path=usr/include/sys/stddef.h file path=usr/include/sys/stdint.h file path=usr/include/sys/stermio.h file path=usr/include/sys/stream.h diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf index 114e9108df..1010ad94ed 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -158,6 +158,7 @@ file path=opt/zfs-tests/bin/file_trunc mode=0555 file path=opt/zfs-tests/bin/file_write mode=0555 file path=opt/zfs-tests/bin/getholes mode=0555 file path=opt/zfs-tests/bin/largest_file mode=0555 +file path=opt/zfs-tests/bin/memory_balloon mode=0555 file path=opt/zfs-tests/bin/mkbusy mode=0555 file path=opt/zfs-tests/bin/mkfiles mode=0555 file path=opt/zfs-tests/bin/mkholes mode=0555 @@ -2302,14 +2303,18 @@ file path=opt/zfs-tests/tests/perf/regression/random_reads mode=0555 file path=opt/zfs-tests/tests/perf/regression/random_readwrite mode=0555 file path=opt/zfs-tests/tests/perf/regression/random_writes mode=0555 file path=opt/zfs-tests/tests/perf/regression/sequential_reads mode=0555 -file path=opt/zfs-tests/tests/perf/regression/sequential_reads_cached \ +file path=opt/zfs-tests/tests/perf/regression/sequential_reads_arc_cached \ mode=0555 -file path=opt/zfs-tests/tests/perf/regression/sequential_reads_cached_clone \ +file \ + path=opt/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone \ + mode=0555 +file path=opt/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached \ mode=0555 file path=opt/zfs-tests/tests/perf/regression/sequential_writes mode=0555 file path=opt/zfs-tests/tests/perf/regression/setup mode=0555 file path=opt/zfs-tests/tests/perf/scripts/io.d mode=0444 file path=opt/zfs-tests/tests/perf/scripts/prefetch_io.d mode=0444 +file path=opt/zfs-tests/tests/perf/scripts/profile.d mode=0444 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL depend fmri=system/file-system/zfs/tests type=require |