Messages in this thread | | | Date | Thu, 15 Mar 2018 20:05:28 -0600 | From | Jason Gunthorpe <> | Subject | Re: linux-next: manual merge of the net-next tree with the rdma-fixes tree |
| |
On Thu, Mar 15, 2018 at 09:18:02PM -0400, Doug Ledford wrote:
> Here's the commit (from the rdma git repo) with the proper merge fix > (although it also has other minor merge stuff that needs to be ignored): > > 2d873449a202 (Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next)
Stephen,
If you merge the branches in the order: rdma for-next, rdma for-rc, then net-next you should not see a merge conflict as rdma for-next already has the correct resolution.
Jason
| |