[illumos-gate merge]

commit e89be50a407de17396dc2e87e7f9aa8160182fb6
    11961 add DDI UFM support to the nvme driver
commit f21abddf5629122d5dd1aa759e5ec0f27610c188
    11963 Allow ptree(1) to wrap output
commit cb09bd3c63580aef9fe1999ae4e48a8a5b9cf55c
    11935 loader: fix memory corruption bug in vdev_read
commit f67d64d998ff666158cc5231b7e80c11c3e922e0
    11954 rpcmod: Possible memory leak in connmgr_get()
    11955 clnt_cots: kmem_free(NULL, 0) is legal
commit f0c1c263e90642997cf3e76484abec617782ddb8
    9601 Divide by zero in i40e_get_available_resources()
commit 67806cd738bddbbd117d50180c8f96050a49a8cc
    11933 loader: we can not read log device but we need to know about
commit 4b6bffb4c4308c6219c095d4cf5bf96bb0970e04
    11928 rpcmod's clnt_cots can do zero-length kmem allocations
commit 48f31329f53c9b7554a923cb617ff7eecb6137e1
    11854 Domain Admins shouldn't always be Administrators
commit 3c1aa8841c55cae7b41cc9b045a71b2fffd4d0cb
    11853 Administrators should have Backup and Restore privileges by default
commit 0292c176d853baa7e46c9ff8e4f16f63b8cbd6e5
    11773 Need ways to override Domain Admins' full control
commit 06721c885c2d7becabe2cba874b84cdfba66eb47
    11852 SMB should explicitly fail deletion of mountpoints
commit dafb549fce563c2f4123e8957dc8a1d921bf0fca
    11039 All zfs/nfs/smb threads in door calls to idle idmap
commit 4ad35fa3117b4f36004f76885e267a46c738a794
    11038 SMB2 server should require signed Validate Negotiate requests

	Conflicts:
	usr/src/uts/common/io/nvme/nvme_var.h
	usr/src/uts/common/io/nvme/nvme.c
	exception_lists/wscheck

0 files changed, 0 insertions, 0 deletions