diff for duplicates of <20200413141538.935574-8-leon@kernel.org> diff --git a/a/1.txt b/N1/1.txt index b4e51b4..5c43727 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -200,9 +200,3 @@ index c71f4328d138..bac8c68df66c 100644 -- 2.25.2 - - -_______________________________________________ -linux-nvme mailing list -linux-nvme@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-nvme diff --git a/a/content_digest b/N1/content_digest index 1ca1e20..48bbbf5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,19 +4,19 @@ "Date\0Mon, 13 Apr 2020 17:15:38 +0300\0" "To\0Doug Ledford <dledford@redhat.com>" " Jason Gunthorpe <jgg@mellanox.com>\0" - "Cc\0rds-devel@oss.oracle.com" + "Cc\0Leon Romanovsky <leonro@mellanox.com>" Bart Van Assche <bvanassche@acm.org> Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> + Christoph Hellwig <hch@lst.de> + David S. Miller <davem@davemloft.net> + Jakub Kicinski <kuba@kernel.org> + linux-nvme@lists.infradead.org linux-rdma@vger.kernel.org netdev@vger.kernel.org + rds-devel@oss.oracle.com + Sagi Grimberg <sagi@grimberg.me> Santosh Shilimkar <santosh.shilimkar@oracle.com> - linux-nvme@lists.infradead.org - Christoph Hellwig <hch@lst.de> - Leon Romanovsky <leonro@mellanox.com> - target-devel@vger.kernel.org - Jakub Kicinski <kuba@kernel.org> - David S. Miller <davem@davemloft.net> - " Sagi Grimberg <sagi@grimberg.me>\0" + " target-devel@vger.kernel.org\0" "\00:1\0" "b\0" "From: Leon Romanovsky <leonro@mellanox.com>\n" @@ -220,12 +220,6 @@ " }\n" " \n" "-- \n" - "2.25.2\n" - "\n" - "\n" - "_______________________________________________\n" - "linux-nvme mailing list\n" - "linux-nvme@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-nvme + 2.25.2 -d633c9cab8fec7f56e98a4704503933626ae68eaea556f1981a3ccfde14f4c70 +8dffaf8419f94353679a12b94e50f1f9bfd1cd56a1a3d59ca47d3b696d84b8d1
diff --git a/a/1.txt b/N2/1.txt index b4e51b4..ed792d6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -45,8 +45,7 @@ index 409f752f40ae..b79f71b10593 100644 ret = cma_send_sidr_rep(id_priv, IB_SIDR_REJECT, 0, private_data, private_data_len); } else { -+ enum ib_cm_rej_reason r = -+ (reason) ?: IB_CM_REJ_CONSUMER_DEFINED; ++ enum ib_cm_rej_reason r + (reason) ?: IB_CM_REJ_CONSUMER_DEFINED; + trace_cm_send_rej(id_priv); - ret = ib_send_cm_rej(id_priv->cm_id.ib, @@ -137,8 +136,7 @@ index 0f1ea5f2d01c..ed328a99ed0a 100644 IB_CM_REJ_INVALID_FLOW_LABEL = 32, IB_CM_REJ_INVALID_ALT_FLOW_LABEL = 33, - IB_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED = 35, -+ IB_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED = -+ RDMA_USER_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED, ++ IB_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED + RDMA_USER_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED, }; struct ib_cm_rej_event_param { @@ -200,9 +198,3 @@ index c71f4328d138..bac8c68df66c 100644 -- 2.25.2 - - -_______________________________________________ -linux-nvme mailing list -linux-nvme@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-nvme diff --git a/a/content_digest b/N2/content_digest index 1ca1e20..e2dcb4c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020200413141538.935574-1-leon@kernel.org\0" "From\0Leon Romanovsky <leon@kernel.org>\0" "Subject\0[PATCH rdma-next v2 7/7] RDMA/cma: Provide ECE reject reason\0" - "Date\0Mon, 13 Apr 2020 17:15:38 +0300\0" + "Date\0Mon, 13 Apr 2020 14:15:38 +0000\0" "To\0Doug Ledford <dledford@redhat.com>" " Jason Gunthorpe <jgg@mellanox.com>\0" "Cc\0rds-devel@oss.oracle.com" @@ -66,8 +66,7 @@ " \t\t\tret = cma_send_sidr_rep(id_priv, IB_SIDR_REJECT, 0,\n" " \t\t\t\t\t\tprivate_data, private_data_len);\n" " \t\t} else {\n" - "+\t\t\tenum ib_cm_rej_reason r =\n" - "+\t\t\t\t(reason) ?: IB_CM_REJ_CONSUMER_DEFINED;\n" + "+\t\t\tenum ib_cm_rej_reason r +\t\t\t\t(reason) ?: IB_CM_REJ_CONSUMER_DEFINED;\n" "+\n" " \t\t\ttrace_cm_send_rej(id_priv);\n" "-\t\t\tret = ib_send_cm_rej(id_priv->cm_id.ib,\n" @@ -158,8 +157,7 @@ " \tIB_CM_REJ_INVALID_FLOW_LABEL\t\t= 32,\n" " \tIB_CM_REJ_INVALID_ALT_FLOW_LABEL\t= 33,\n" "-\tIB_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED\t= 35,\n" - "+\tIB_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED\t=\n" - "+\t\tRDMA_USER_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED,\n" + "+\tIB_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED\t+\t\tRDMA_USER_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED,\n" " };\n" " \n" " struct ib_cm_rej_event_param {\n" @@ -220,12 +218,6 @@ " }\n" " \n" "-- \n" - "2.25.2\n" - "\n" - "\n" - "_______________________________________________\n" - "linux-nvme mailing list\n" - "linux-nvme@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-nvme + 2.25.2 -d633c9cab8fec7f56e98a4704503933626ae68eaea556f1981a3ccfde14f4c70 +fbf015dff5df42c3bcfd2f16a067c981724cd1ffe6e2ce68819d3be0f0c9124e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.