linux-kernel - Re: linux-next: manual merge of the rdma tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <56373D85.4070408@mellanox.com>
Date:	Mon, 2 Nov 2015 12:40:05 +0200
From:	Sagi Grimberg <sagig@...lanox.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Doug Ledford <dledford@...hat.com>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Steve Wise <swise@...ngridcomputing.com>,
	"J. Bruce Fields" <bfields@...hat.com>
Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree

> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/