re #12393 rb3935 Kerberos and smbd disagree about who is our AD server (fix elf runtime attributes check)
re #11612 rb3907 Failing vdev of a mirrored pool should not take zfs operations out of action for extended periods of time.

*** 20,29 ****
--- 20,32 ----
   */
  /*
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
+ /*
+  * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
+  */
  
  #ifndef _SYS_FM_FS_ZFS_H
  #define _SYS_FM_FS_ZFS_H
  
  #ifdef  __cplusplus
*** 32,41 ****
--- 35,45 ----
  
  #define ZFS_ERROR_CLASS                         "fs.zfs"
  
  #define FM_EREPORT_ZFS_CHECKSUM                 "checksum"
  #define FM_EREPORT_ZFS_IO                       "io"
+ #define FM_EREPORT_ZFS_TIMEOUT                  "timeout"
  #define FM_EREPORT_ZFS_DATA                     "data"
  #define FM_EREPORT_ZFS_POOL                     "zpool"
  #define FM_EREPORT_ZFS_DEVICE_UNKNOWN           "vdev.unknown"
  #define FM_EREPORT_ZFS_DEVICE_OPEN_FAILED       "vdev.open_failed"
  #define FM_EREPORT_ZFS_DEVICE_CORRUPT_DATA      "vdev.corrupt_data"
*** 66,75 ****
--- 70,81 ----
  #define FM_EREPORT_PAYLOAD_ZFS_ZIO_LEVEL        "zio_level"
  #define FM_EREPORT_PAYLOAD_ZFS_ZIO_BLKID        "zio_blkid"
  #define FM_EREPORT_PAYLOAD_ZFS_ZIO_ERR          "zio_err"
  #define FM_EREPORT_PAYLOAD_ZFS_ZIO_OFFSET       "zio_offset"
  #define FM_EREPORT_PAYLOAD_ZFS_ZIO_SIZE         "zio_size"
+ #define FM_EREPORT_PAYLOAD_ZFS_ZIO_LATENCY      "zio_latency"
+ #define FM_EREPORT_PAYLOAD_ZFS_ZIO_TIMEOUT      "zio_timeout"
  #define FM_EREPORT_PAYLOAD_ZFS_PREV_STATE       "prev_state"
  #define FM_EREPORT_PAYLOAD_ZFS_CKSUM_EXPECTED   "cksum_expected"
  #define FM_EREPORT_PAYLOAD_ZFS_CKSUM_ACTUAL     "cksum_actual"
  #define FM_EREPORT_PAYLOAD_ZFS_CKSUM_ALGO       "cksum_algorithm"
  #define FM_EREPORT_PAYLOAD_ZFS_CKSUM_BYTESWAP   "cksum_byteswap"