Print this page
NEX-8148 Alerts should be sent if cores are created on a system
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-2756 iscsit should fold the case of scsi names that we get from initiators
Reviewed by: Steve Peng <steve.peng@nexenta.com>
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-4431 want NVMe management utility
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
4185 add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R (fix studio build)
4185 add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Garrett D'Amore <garrett@damore.org>
NEX-3775 Implement krrp-ioctl that can be used to retrieve information about a session
 implemented get_session_status IOCTL
 impelement corresponding functionality in libkrrp and krrpadm
 Reviewed by: Alek Pinchuk <alek@nexenta.com>
NEX-3558 KRRP Integration
NEX-3508 CLONE - Port NEX-2946 Add UNMAP/TRIM functionality to ZFS and illumos
Reviewed by: Josef Sipek <josef.sipek@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
Conflicts:
    usr/src/uts/common/io/scsi/targets/sd.c
    usr/src/uts/common/sys/scsi/targets/sddef.h
Fix up some merges where we wanted the upstream version.
re #13842 make clobber leaves trash
Adding AoE support to nza-kernel
        
*** 23,33 ****
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2014, Joyent, Inc. All rights reserved.
  # Copyright 2013 Garrett D'Amore <garrett@damore.org>
  # Copyright 2013 Saso Kiselkov. All rights reserved.
  # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
! # Copyright 2016 Nexenta Systems, Inc.
  # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
  #
  
  include $(SRC)/uts/Makefile.uts
  
--- 23,33 ----
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2014, Joyent, Inc. All rights reserved.
  # Copyright 2013 Garrett D'Amore <garrett@damore.org>
  # Copyright 2013 Saso Kiselkov. All rights reserved.
  # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
! # Copyright 2017 Nexenta Systems, Inc.
  # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
  #
  
  include $(SRC)/uts/Makefile.uts
  
*** 79,88 ****
--- 79,89 ----
          aggr_impl.h             \
          aio.h                   \
          aio_impl.h              \
          aio_req.h               \
          aiocb.h                 \
+         aoe.h                   \
          ascii.h                 \
          asynch.h                \
          atomic.h                \
          attr.h                  \
          audio.h                 \
*** 186,195 ****
--- 187,197 ----
          devpoll.h               \
          dirent.h                \
          disp.h                  \
          dkbad.h                 \
          dkio.h                  \
+         dkioc_free_util.h       \
          dklabel.h               \
          dl.h                    \
          dlpi.h                  \
          dld.h                   \
          dld_impl.h              \
*** 337,346 ****
--- 339,350 ----
          kmdb.h                  \
          kmem.h                  \
          kmem_impl.h             \
          kobj.h                  \
          kobj_impl.h             \
+         kreplication_common.h   \
+         krrp.h                  \
          ksocket.h               \
          kstat.h                 \
          kstr.h                  \
          ksyms.h                 \
          ksynch.h                \
*** 831,840 ****
--- 835,847 ----
          pci.h                   \
          scsi.h                  \
          sun4upci.h              \
          opl_mc_fm.h
  
+ FMSWHDRS=                       \
+         core.h
+ 
  FSHDRS=                         \
          autofs.h                \
          decomp.h                \
          dv_node.h               \
          sdev_impl.h             \
*** 982,992 ****
          dr.h            \
          env.h           \
          eventdefs.h     \
          ipmp.h          \
          pwrctl.h        \
!         vrrp.h
  
  CONTRACTHDRS=           \
          process.h       \
          process_impl.h  \
          device.h        \
--- 989,1000 ----
          dr.h            \
          env.h           \
          eventdefs.h     \
          ipmp.h          \
          pwrctl.h        \
!         vrrp.h          \
!         krrp.h
  
  CONTRACTHDRS=           \
          process.h       \
          process_impl.h  \
          device.h        \
*** 1155,1164 ****
--- 1163,1173 ----
          $(ISCSITHDRS:%.h=iscsit/%.check)                        \
          $(ISOHDRS:%.h=iso/%.check)                      \
          $(FMHDRS:%.h=fm/%.check)                        \
          $(FMFSHDRS:%.h=fm/fs/%.check)                   \
          $(FMIOHDRS:%.h=fm/io/%.check)                   \
+         $(FMSWHDRS:%.h=fm/sw/%.check)                   \
          $(FSHDRS:%.h=fs/%.check)                        \
          $(SCSIHDRS:%.h=scsi/%.check)                    \
          $(SCSIADHDRS:%.h=scsi/adapters/%.check)         \
          $(SCSICONFHDRS:%.h=scsi/conf/%.check)           \
          $(SCSIIMPLHDRS:%.h=scsi/impl/%.check)           \
*** 1204,1213 ****
--- 1213,1223 ----
          $(ROOTFCIMPLHDRS)       \
          $(ROOTFCULPHDRS)        \
          $(ROOTFMHDRS)           \
          $(ROOTFMIOHDRS)         \
          $(ROOTFMFSHDRS)         \
+         $(ROOTFMSWHDRS)         \
          $(ROOTFSHDRS)           \
          $(ROOTIBDHDRS)          \
          $(ROOTIBHDRS)           \
          $(ROOTIBTLHDRS)         \
          $(ROOTIBTLIMPLHDRS)     \
*** 1271,1280 ****
--- 1281,1291 ----
          $(ROOTFCIMPLHDRS)       \
          $(ROOTFCULPHDRS)        \
          $(ROOTFMHDRS)           \
          $(ROOTFMFSHDRS)         \
          $(ROOTFMIOHDRS)         \
+         $(ROOTFMSWHDRS)         \
          $(ROOTFSHDRS)           \
          $(ROOTIBDHDRS)          \
          $(ROOTIBHDRS)           \
          $(ROOTIBTLHDRS)         \
          $(ROOTIBTLIMPLHDRS)     \