From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>,
Doug Ledford <dledford@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Or Gerlitz <ogerlitz@mellanox.com>
Subject: linux-next: manual merge of the target-updates tree with the rdma tree
Date: Fri, 8 Jan 2016 15:34:57 +1100 [thread overview]
Message-ID: <20160108153457.2e08bfdf@canb.auug.org.au> (raw)
Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in:
drivers/infiniband/ulp/isert/ib_isert.c
between commit:
4a061b287b1e ("IB/ulps: Avoid calling ib_query_device")
from the rdma tree and commit:
373a4cd73782 ("iser-target: Fix non negative ERR_PTR isert_device_get usage")
from the target-updates tree.
I fixed it up (the former removed the code fixed up by the latter)
and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2016-01-08 4:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 4:34 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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
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=20160108153457.2e08bfdf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dledford@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nab@linux-iscsi.org \
--cc=ogerlitz@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).