diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-12-07 22:53:58 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-12-07 22:55:43 +0000 |
| commit | 8d0ef42b94a3f1e90b26f771de520676997e1b71 (patch) | |
| tree | 5d73413422e6d5874364f435860a0b3739981cff /usr/src/uts/common/io | |
| parent | b52a5669bddec6105dcfea44c33c7f7d2eb245ed (diff) | |
| parent | 7adb730b589e553bf3b1ccfd9bae2df91c5c1061 (diff) | |
| download | illumos-joyent-8d0ef42b94a3f1e90b26f771de520676997e1b71.tar.gz | |
[illumos-gate merge]
commit 7adb730b589e553bf3b1ccfd9bae2df91c5c1061
5369 arc flags should be an enum
5370 consistent arc_buf_hdr_t naming scheme
commit bafd1f1462c49949e0251d74b4fbfa24d29bc79a
5330 zone brands could control init restart behavior
commit 156d6b3a5d0ba06e75f7973c6ba994107ae8df0e
5342 prstat -n option should accept 0
commit abdbe11c7877311202d2870b53d7c76264121b2c
5297 mptsas refhash replacement on reset can cause hang
Conflicts:
usr/src/uts/common/sys/zone.h
usr/src/uts/common/os/exit.c (OS-3429)
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
usr/src/uts/common/fs/zfs/arc.c
usr/src/man/man1m/prstat.1m
usr/src/lib/libbrand/common/libbrand.c
usr/src/cmd/zoneadmd/zoneadmd.c (OS-1170)
usr/src/lib/libbrand/common/libbrand.h (copyright)
usr/src/lib/libbrand/common/mapfile-vers (copyright)
Diffstat (limited to 'usr/src/uts/common/io')
| -rw-r--r-- | usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c index ca298164bb..f094c9a510 100644 --- a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c +++ b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c @@ -14474,7 +14474,7 @@ mptsas_update_driver_data(struct mptsas *mpt) * targets that are still present and reassociate them with * their potentially new devhdls. Leaving the targets around in * this fashion allows them to be used on the tx waitq even - * while IOC reset it occurring. + * while IOC reset is occurring. */ for (tp = refhash_first(mpt->m_targets); tp != NULL; tp = refhash_next(mpt->m_targets, tp)) { |