From: "Nicholas A. Bellinger" <nab@linux-iscsi•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Doug Ledford <dledford@redhat•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>,
Sagi Grimberg <sagig@mellanox•com>,
Jenny Derzhavetz <jennyf@mellanox•com>,
Or Gerlitz <ogerlitz@mellanox•com>
Subject: Re: linux-next: manual merge of the target-updates tree with the rdma tree
Date: Thu, 07 Jan 2016 02:04:42 -0800 [thread overview]
Message-ID: <1452161082.14302.22.camel@haakon3.risingtidesystems.com> (raw)
In-Reply-To: <20160107164212.4cfbbe02@canb.auug.org.au>
On Thu, 2016-01-07 at 16:42 +1100, Stephen Rothwell wrote:
> Hi Nicholas,
>
> Today's linux-next merge of the target-updates tree got conflicts in:
>
> drivers/infiniband/ulp/iser/iscsi_iser.h
> drivers/infiniband/ulp/iser/iser_initiator.c
> drivers/infiniband/ulp/iser/iser_memory.c
> drivers/infiniband/ulp/iser/iser_verbs.c
> drivers/infiniband/ulp/isert/ib_isert.c
>
> between commits:
>
> 4a061b287b1e ("IB/ulps: Avoid calling ib_query_device")
> cfeb91b375ad ("IB/iser: Convert to CQ abstraction")
> 2392a4cdcb8d ("IB/iser: constify iser_reg_ops structure")
> 422bd0acb062 ("IB/isert: Support the remote invalidation exception")
> 59caaed7a72a ("IB/iser: Support the remote invalidation exception")
>
> from the rdma tree and commit:
>
> ddca7d44ccd2 ("iser: Have initiator and target to share protocol structures and definitions")
> 6d2cb3ad4bc2 ("iser-target: Support the remote invalidation exception")
> c37c810bae45 ("IB/iser: Increment the rkey when registering and not when invalidating")
> 9a4a71456262 ("IB/iser: Support the remote invalidation exception")
>
> from the target-updates tree.
>
> I fixed it up (hopefully - mainly taking one of the other side (usually
> the rdma tree version, so please check the result when I release it)
> and can carry the fix as necessary (no action is required).
>
> Seom of these patches are very similar ...
>
Thanks SFR.
Sagi & Or, to confirm the iser/iser-target changes currently queued in
Doug's rdma.git for-next branch means the -v2 series introducing
remote invalidation support here:
http://www.spinics.net/lists/target-devel/msg11289.html
can now be safely dropped from target-pending/for-next, yes..?
next prev parent reply other threads:[~2016-01-07 10:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 5:42 linux-next: manual merge of the target-updates tree with the rdma tree Stephen Rothwell
2016-01-07 10:04 ` Nicholas A. Bellinger [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-01-08 4:34 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452161082.14302.22.camel@haakon3.risingtidesystems.com \
--to=nab@linux-iscsi$(echo .)org \
--cc=dledford@redhat$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=jennyf@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ogerlitz@mellanox$(echo .)com \
--cc=sagig@mellanox$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox