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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/Makefile
          +++ new/usr/src/uts/common/sys/Makefile
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright 2014, Joyent, Inc. All rights reserved.
  25   25  # Copyright 2013 Garrett D'Amore <garrett@damore.org>
  26   26  # Copyright 2013 Saso Kiselkov. All rights reserved.
  27   27  # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
  28      -# Copyright 2016 Nexenta Systems, Inc.
       28 +# Copyright 2017 Nexenta Systems, Inc.
  29   29  # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
  30   30  #
  31   31  
  32   32  include $(SRC)/uts/Makefile.uts
  33   33  
  34   34  FILEMODE=644
  35   35  
  36   36  #
  37   37  #       Note that the following headers are present in the kernel but
  38   38  #       neither installed or shipped as part of the product:
↓ open down ↓ 35 lines elided ↑ open up ↑
  74   74          acct.h                  \
  75   75          acctctl.h               \
  76   76          acl.h                   \
  77   77          acl_impl.h              \
  78   78          aggr.h                  \
  79   79          aggr_impl.h             \
  80   80          aio.h                   \
  81   81          aio_impl.h              \
  82   82          aio_req.h               \
  83   83          aiocb.h                 \
       84 +        aoe.h                   \
  84   85          ascii.h                 \
  85   86          asynch.h                \
  86   87          atomic.h                \
  87   88          attr.h                  \
  88   89          audio.h                 \
  89   90          audioio.h               \
  90   91          autoconf.h              \
  91   92          auxv.h                  \
  92   93          auxv_386.h              \
  93   94          auxv_SPARC.h            \
↓ open down ↓ 87 lines elided ↑ open up ↑
 181  182          devfm.h                 \
 182  183          devid_cache.h           \
 183  184          devinfo_impl.h          \
 184  185          devops.h                \
 185  186          devpolicy.h             \
 186  187          devpoll.h               \
 187  188          dirent.h                \
 188  189          disp.h                  \
 189  190          dkbad.h                 \
 190  191          dkio.h                  \
      192 +        dkioc_free_util.h       \
 191  193          dklabel.h               \
 192  194          dl.h                    \
 193  195          dlpi.h                  \
 194  196          dld.h                   \
 195  197          dld_impl.h              \
 196  198          dld_ioc.h               \
 197  199          dls.h                   \
 198  200          dls_mgmt.h              \
 199  201          dls_impl.h              \
 200  202          dma_i8237A.h            \
↓ open down ↓ 131 lines elided ↑ open up ↑
 332  334          kiconv_utf8_hkscs.h     \
 333  335          kiconv_utf8_uhc.h       \
 334  336          kidmap.h                \
 335  337          klpd.h                  \
 336  338          klwp.h                  \
 337  339          kmdb.h                  \
 338  340          kmem.h                  \
 339  341          kmem_impl.h             \
 340  342          kobj.h                  \
 341  343          kobj_impl.h             \
      344 +        kreplication_common.h   \
      345 +        krrp.h                  \
 342  346          ksocket.h               \
 343  347          kstat.h                 \
 344  348          kstr.h                  \
 345  349          ksyms.h                 \
 346  350          ksynch.h                \
 347  351          ldterm.h                \
 348  352          lgrp.h                  \
 349  353          lgrp_user.h             \
 350  354          libc_kernel.h           \
 351  355          link.h                  \
↓ open down ↓ 474 lines elided ↑ open up ↑
 826  830          zfs.h
 827  831  
 828  832  FMIOHDRS=                       \
 829  833          ddi.h                   \
 830  834          disk.h                  \
 831  835          pci.h                   \
 832  836          scsi.h                  \
 833  837          sun4upci.h              \
 834  838          opl_mc_fm.h
 835  839  
      840 +FMSWHDRS=                       \
      841 +        core.h
      842 +
 836  843  FSHDRS=                         \
 837  844          autofs.h                \
 838  845          decomp.h                \
 839  846          dv_node.h               \
 840  847          sdev_impl.h             \
 841  848          fifonode.h              \
 842  849          hsfs_isospec.h          \
 843  850          hsfs_node.h             \
 844  851          hsfs_rrip.h             \
 845  852          hsfs_spec.h             \
↓ open down ↓ 131 lines elided ↑ open up ↑
 977  984  
 978  985  SYSEVENTHDRS=           \
 979  986          ap_driver.h     \
 980  987          dev.h           \
 981  988          domain.h        \
 982  989          dr.h            \
 983  990          env.h           \
 984  991          eventdefs.h     \
 985  992          ipmp.h          \
 986  993          pwrctl.h        \
 987      -        vrrp.h
      994 +        vrrp.h          \
      995 +        krrp.h
 988  996  
 989  997  CONTRACTHDRS=           \
 990  998          process.h       \
 991  999          process_impl.h  \
 992 1000          device.h        \
 993 1001          device_impl.h
 994 1002  
 995 1003  USBHDRS=        \
 996 1004          usba.h  \
 997 1005          usbai.h
↓ open down ↓ 152 lines elided ↑ open up ↑
1150 1158          $(TAVORHDRS:%.h=ib/adapters/tavor/%.check)      \
1151 1159          $(HERMONHDRS:%.h=ib/adapters/hermon/%.check)    \
1152 1160          $(MLNXHDRS:%.h=ib/adapters/%.check)             \
1153 1161          $(IDMHDRS:%.h=idm/%.check)                      \
1154 1162          $(ISCSIHDRS:%.h=iscsi/%.check)                  \
1155 1163          $(ISCSITHDRS:%.h=iscsit/%.check)                        \
1156 1164          $(ISOHDRS:%.h=iso/%.check)                      \
1157 1165          $(FMHDRS:%.h=fm/%.check)                        \
1158 1166          $(FMFSHDRS:%.h=fm/fs/%.check)                   \
1159 1167          $(FMIOHDRS:%.h=fm/io/%.check)                   \
     1168 +        $(FMSWHDRS:%.h=fm/sw/%.check)                   \
1160 1169          $(FSHDRS:%.h=fs/%.check)                        \
1161 1170          $(SCSIHDRS:%.h=scsi/%.check)                    \
1162 1171          $(SCSIADHDRS:%.h=scsi/adapters/%.check)         \
1163 1172          $(SCSICONFHDRS:%.h=scsi/conf/%.check)           \
1164 1173          $(SCSIIMPLHDRS:%.h=scsi/impl/%.check)           \
1165 1174          $(SCSIISCSIHDRS:%.h=scsi/adapters/%.check)      \
1166 1175          $(SCSIGENHDRS:%.h=scsi/generic/%.check)         \
1167 1176          $(SCSITARGETSHDRS:%.h=scsi/targets/%.check)     \
1168 1177          $(SCSIVHCIHDRS:%.h=scsi/adapters/%.check)       \
1169 1178          $(SATAGENHDRS:%.h=sata/%.check)                 \
↓ open down ↓ 29 lines elided ↑ open up ↑
1199 1208          $(ROOTIDMHDRS)          \
1200 1209          $(ROOTISCSIHDRS)        \
1201 1210          $(ROOTISCSITHDRS)       \
1202 1211          $(ROOTFC4HDRS)          \
1203 1212          $(ROOTFCHDRS)           \
1204 1213          $(ROOTFCIMPLHDRS)       \
1205 1214          $(ROOTFCULPHDRS)        \
1206 1215          $(ROOTFMHDRS)           \
1207 1216          $(ROOTFMIOHDRS)         \
1208 1217          $(ROOTFMFSHDRS)         \
     1218 +        $(ROOTFMSWHDRS)         \
1209 1219          $(ROOTFSHDRS)           \
1210 1220          $(ROOTIBDHDRS)          \
1211 1221          $(ROOTIBHDRS)           \
1212 1222          $(ROOTIBTLHDRS)         \
1213 1223          $(ROOTIBTLIMPLHDRS)     \
1214 1224          $(ROOTIBNEXHDRS)        \
1215 1225          $(ROOTIBMGTHDRS)        \
1216 1226          $(ROOTIBMFHDRS)         \
1217 1227          $(ROOTOFHDRS)           \
1218 1228          $(ROOTRDMAHDRS)         \
↓ open down ↓ 47 lines elided ↑ open up ↑
1266 1276          $(ROOTIDMHDRS)          \
1267 1277          $(ROOTISCSIHDRS)        \
1268 1278          $(ROOTISCSITHDRS)       \
1269 1279          $(ROOTFC4HDRS)          \
1270 1280          $(ROOTFCHDRS)           \
1271 1281          $(ROOTFCIMPLHDRS)       \
1272 1282          $(ROOTFCULPHDRS)        \
1273 1283          $(ROOTFMHDRS)           \
1274 1284          $(ROOTFMFSHDRS)         \
1275 1285          $(ROOTFMIOHDRS)         \
     1286 +        $(ROOTFMSWHDRS)         \
1276 1287          $(ROOTFSHDRS)           \
1277 1288          $(ROOTIBDHDRS)          \
1278 1289          $(ROOTIBHDRS)           \
1279 1290          $(ROOTIBTLHDRS)         \
1280 1291          $(ROOTIBTLIMPLHDRS)     \
1281 1292          $(ROOTIBNEXHDRS)        \
1282 1293          $(ROOTIBMGTHDRS)        \
1283 1294          $(ROOTIBMFHDRS)         \
1284 1295          $(ROOTOFHDRS)           \
1285 1296          $(ROOTRDMAHDRS)         \
↓ open down ↓ 56 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX