From: Keith Busch <kbusch@kernel.org>
Date: Mon, 17 Feb 2020 20:32:48 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/linux-nvme/libnvme
X-Git-Tag: v1.0-rc0~167
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fe798c9682d5f3950e19202877019276aa2caefa;p=users%2Fsagi%2Flibnvme.git

Merge branch 'master' of https://github.com/linux-nvme/libnvme
---

fe798c9682d5f3950e19202877019276aa2caefa
diff --cc src/nvme/types.h
index 3a15c2fa,88ccb9c9..75a220d1
--- a/src/nvme/types.h
+++ b/src/nvme/types.h
@@@ -446,10 -448,10 +448,10 @@@ struct nvme_id_psd 
   * 	       power states supported by the controller, indicating the number
   * 	       of valid entries in &struct nvme_id_ctrl.psd. This is a 0's
   * 	       based value.
-- * @avscc:     Admin Vendor Specific Command Configuration, see &enum
-- * 	       nvme_id_ctrl_avscc.
-- * @apsta:     Autonomous Power State Transition Attributes, see &enum
-- * 	       nvme_id_ctrl_apsta.
++ * @avscc:     Admin Vendor Specific Command Configuration, see
++ * 	       &enum nvme_id_ctrl_avscc.
++ * @apsta:     Autonomous Power State Transition Attributes, see
++ * 	       &enum nvme_id_ctrl_apsta.
   * @wctemp:    Warning Composite Temperature Threshold indicates
   * 	       the minimum Composite Temperature field value (see &struct
   * 	       nvme_smart_log.critical_comp_time) that indicates an overheating
@@@ -473,8 -475,8 +475,8 @@@
   * 	       The value is in bytes.
   * @unvmcap:   Unallocated NVM Capacity, the unallocated NVM capacity in the
   * 	       NVM subsystem. The value is in bytes.
-- * @rpmbs      Replay Protected Memory Block Support, see &enum
-- * 	       nvme_id_ctrl_rpmbs.
++ * @rpmbs      Replay Protected Memory Block Support, see
++ * 	       &enum nvme_id_ctrl_rpmbs.
   * @edstt      Extended Device Self-test Time, if Device Self-test command is
   * 	       supported (see &struct nvme_id_ctrl.oacs, %NVME_CTRL_OACS_SELF_TEST),
   * 	       then this field indicates the nominal amount of time in one
@@@ -514,8 -516,8 +516,8 @@@
   * 	       seconds, for a transition between ANA states or the maximum
   * 	       amount of time, in seconds, that the controller reports the ANA
   * 	       change state.
-- * @anacap:    Asymmetric Namespace Access Capabilities, see &enum
-- * 	       nvme_id_ctrl_anacap.
++ * @anacap:    Asymmetric Namespace Access Capabilities, see
++ * 	       &enum nvme_id_ctrl_anacap.
   * @anagrpmax: ANA Group Identifier Maximum indicates the maximum value of a
   * 	       valid ANA Group Identifier for any controller in the NVM
   * 	       subsystem.
@@@ -546,10 -548,10 +548,10 @@@
   * 	       all namespaces with any supported namespace format during a
   * 	       power fail or error condition. This field is specified in
   * 	       logical blocks and is a 0’s based value.
-- * @nvscc:     NVM Vendor Specific Command Configuration, see &enum
-- * 	       nvme_id_ctrl_nvscc.
-- * @nwpc:      Namespace Write Protection Capabilities, see &enum
-- * 	       nvme_id_ctrl_nwpc.
++ * @nvscc:     NVM Vendor Specific Command Configuration, see
++ * 	       &enum nvme_id_ctrl_nvscc.
++ * @nwpc:      Namespace Write Protection Capabilities, see
++ * 	       &enum nvme_id_ctrl_nwpc.
   * @acwu:      Atomic Compare & Write Unit indicates the size of the write
   * 	       operation guaranteed to be written atomically to the NVM across
   * 	       all namespaces with any supported namespace format for a Compare
@@@ -1220,10 -1222,10 +1222,10 @@@ enum nvme_lbaf_rp 
   * 	      and the highest possible index to &struct nvme_id_ns.labf.
   * @flbas:    Formatted LBA Size, see &enum nvme_id_ns_flbas.
   * @mc:       Metadata Capabilities, see &enum nvme_id_ns_mc.
-- * @dpc:      End-to-end Data Protection Capabilities, see &enum
-- * 	      nvme_id_ns_dpc.
-- * @dps:      End-to-end Data Protection Type Settings, see &enum
-- * 	      nvme_id_ns_dps.
++ * @dpc:      End-to-end Data Protection Capabilities, see
++ * 	      &enum nvme_id_ns_dpc.
++ * @dps:      End-to-end Data Protection Type Settings, see
++ * 	      &enum nvme_id_ns_dps.
   * @nmic:     Namespace Multi-path I/O and Namespace Sharing Capabilities, see
   * 	      &enum nvme_id_ns_nmic.
   * @rescap:   Reservation Capabilities, see &enum nvme_id_ns_rescap.
@@@ -2031,12 -2009,12 +2028,12 @@@ struct nvme_self_test_log 
   */
  struct nvme_telemetry_log {
  	__u8	lpi;
--	__u8	rsvd[4];
++	__u8	rsvd1[4];
  	__u8	ieee[3];
  	__le16	dalb1;
  	__le16	dalb2;
  	__le16	dalb3;
--	__u8	rsvd1[368];
++	__u8	rsvd14[368];
  	__u8	ctrlavail;
  	__u8	ctrldgn;
  	__u8	rsnident[128];
@@@ -2313,7 -2291,7 +2310,7 @@@ struct nvme_eg_event_aggregate_log 
  /**
   * struct nvme_resv_notification_log -
   * @lpc:
-- * @rnlpt:
++ * @rnlpt: See &enum nvme_resv_notify_rnlpt.
   * @nalp:
   * @nsid:
   */
@@@ -2327,13 -2305,13 +2324,13 @@@ struct nvme_resv_notification_log 
  };
  
  /**
-- * enum -
++ * enum nvme_resv_notify_rnlpt -
   * @NVME_RESV_NOTIFY_RNLPT_EMPTY:
   * @NVME_RESV_NOTIFY_RNLPT_REGISTRATION_PREEMPTED:
   * @NVME_RESV_NOTIFY_RNLPT_RESERVATION_RELEASED:
   * @NVME_RESV_NOTIFY_RNLPT_RESERVATION_PREEMPTED:
   */
--enum {
++enum nvme_resv_notify_rnlpt {{
  	NVME_RESV_NOTIFY_RNLPT_EMPTY			= 0,
  	NVME_RESV_NOTIFY_RNLPT_REGISTRATION_PREEMPTED	= 1,
  	NVME_RESV_NOTIFY_RNLPT_RESERVATION_RELEASED	= 2,