diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-02-04 10:38:56 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-02-04 10:38:56 -0500 |
| commit | b57791dd2ad47157c6f0aedb7c1a3dc1abd4bfb3 (patch) | |
| tree | 15d9b767cc031fac8a05a90c688af75867efc6ed /usr/src/uts/intel | |
| parent | d17f64dace0684de9710c41b5d8b6b76dd82a5ce (diff) | |
| parent | c2270953142194d5f260d803d60104fad12ab076 (diff) | |
| download | illumos-joyent-b57791dd2ad47157c6f0aedb7c1a3dc1abd4bfb3.tar.gz | |
[illumos-gate merge]
commit c2270953142194d5f260d803d60104fad12ab076
6779 kernel panic in zfs_readdir shortly after mount
commit b8aa3def2e2531e693fba6d1f00a74339a4a663d
11174 new driver for Smart Array storage controllers
Conflicts (whitespace only):
usr/src/uts/common/io/scsi/adapters/smrt/smrt_ciss.c
usr/src/uts/common/io/scsi/adapters/smrt/smrt_device.c
usr/src/uts/common/io/scsi/adapters/smrt/smrt_physical.c
usr/src/uts/common/sys/scsi/adapters/smrt/smrt_scsi.h
usr/src/uts/intel/smrt/Makefile
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/smrt/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/intel/smrt/Makefile b/usr/src/uts/intel/smrt/Makefile index ce78cddb11..37d47e1395 100644 --- a/usr/src/uts/intel/smrt/Makefile +++ b/usr/src/uts/intel/smrt/Makefile @@ -38,7 +38,7 @@ ALL_TARGET = $(BINARY) $(CONFMOD) INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # -# Kernel Module Dependencies +# Kernel Module Dependencies # LDFLAGS += -Nmisc/scsi |