Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Doug Ledford <dledford@redhat.com>
References: <20151101184815.1c854867@canb.auug.org.au>
CC: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        Steve Wise <swise@opengridcomputing.com>,
        "J. Bruce Fields" <bfields@redhat.com>
From: Sagi Grimberg <sagig@mellanox.com>
Message-ID: <56373D85.4070408@mellanox.com>
Date: Mon, 2 Nov 2015 12:40:05 +0200
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101
 Thunderbird/38.3.0
MIME-Version: 1.0
In-Reply-To: <20151101184815.1c854867@canb.auug.org.au>
Content-Type: text/plain; charset="windows-1252"; format=flowed
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:23
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2015 10:39:42.0764
 (UTC)
X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a652971c-7d2e-4d9b-a6a4-d149256f461b;Ip=[193.47.165.134];Helo=[mtlcas13.mtl.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR05MB347
X-Microsoft-Exchange-Diagnostics: 1;DB3PR05MB041;2:o9orJr9w9t19TSdyVZlOCMRInmL1h5sPLPIzbzpnI9/sWVWfQKtS2IO1TAtTi5q4M9USluQmYH8Ejl+8ky5C5VzyUClUAl+Fa7Etb2MJYW7TPqKYeFzGnIxfXFxOuIEyQSboaxU8KRh1g1JlLH/JPsZwTPg55NPoF9RwkYyqTaU=;23:3F6x0Q/Nb2FXWZyuqjJjk0C1MC1H0fUQedX9rP8LfOXWnXARh4ERpjiqSVnWgutzT7MQ064x267TVmf8RmbsPPUh6dt0fWm/xSqjzKQgpTIDm7QnMtCFbijCiEh8QsV0DQRcwTtXZ7L9KLOxVlEexTl9BGCQVmAY783lnjJ/Y3sgdn9cj89+4FTjokhT7cwY
X-OriginatorOrg: Mellanox.com
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 762
Lines: 31

> Hi Doug,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
>    net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
>
> between commit:
>
>    c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page offset")
>
> from Linus' tree and commit:
>
>    412a15c0fe53 ("svcrdma: Port to new memory registration API")
>
> from the rdma tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
>

Hi Stephen,

The fix looks correct to me.

Cheers,
Sagi.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/