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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the rdma tree with Linus' tree
Date	2016-03-22 01:30 +0100
Message-ID	<rfimR-4U6-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Doug,

Today's linux-next merge of the rdma tree got a conflict in:

  drivers/staging/rdma/hfi1/user_pages.c

between commit:

  7e43d4d25558 ("staging: rdma: hfi1: Compress return logic")

from Linus' tree and commit:

  0b091fb32c5a ("staging/hfi1: Enable TID caching feature")

from the rdma tree.

I fixed it up (the latter removed the function that was updated in the
former) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the rdma tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-22 01:30 +0100

csiph-web