* linux-next: manual merge of the target-updates tree with the infiniband tree
@ 2015-04-20 4:29 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-04-20 4:29 UTC (permalink / raw)
To: Nicholas A. Bellinger, Roland Dreier, linux-rdma
Cc: linux-next, linux-kernel, Doug Ledford, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in
drivers/infiniband/ulp/srpt/ib_srpt.c between commit 9f5d32af09b9
("ib_srpt: convert printk's to pr_* functions") from the infiniband
tree and commit 9ac8928e6a3e ("target: simplify the target template
registration API") from the target-updates tree.
I fixed it up (the latter removed some of the code updated by the
former) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-20 4:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-20 4:29 linux-next: manual merge of the target-updates tree with the infiniband tree Stephen Rothwell
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).