[lkml]   [2015]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the target-updates tree with the infiniband tree
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).

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2015-04-20 07:01    [W:0.032 / U:4.816 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site