From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the rdma tree with Linus' tree Date: Tue, 22 Mar 2016 11:33:19 +1100 Message-ID: <20160322113319.021de191@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:40632 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750787AbcCVAdV (ORCPT ); Mon, 21 Mar 2016 20:33:21 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Doug Ledford Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bhaktipriya Shridhar , Greg Kroah-Hartman , Hari Prasath Gujulan Elango Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/staging/rdma/hfi1/verbs.c between commit: e1af35bc7942 ("staging: rdma: hfi1: Use setup_timer") from Linus' tree and commit: 045277cf1548 ("IB/qib,staging/rdma/hfi1: use setup_timer api") from the rdma tree. I fixed it up (I just used the latter version) 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