From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vinod Koul Subject: Re: linux-next: manual merge of the tty tree with the slave-dma tree Date: Mon, 5 Sep 2016 18:13:05 +0530 Message-ID: <20160905124305.GQ9355@localhost> References: <20160905164321.4dd8801b@canb.auug.org.au> <20160905112802.GJ9355@localhost> <20160905113333.GA27586@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mga06.intel.com ([134.134.136.31]:64949 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755061AbcIEMe4 (ORCPT ); Mon, 5 Sep 2016 08:34:56 -0400 Content-Disposition: inline In-Reply-To: <20160905113333.GA27586@kroah.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Greg KH Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nandor Han , Dave Jiang On Mon, Sep 05, 2016 at 01:33:33PM +0200, Greg KH wrote: > On Mon, Sep 05, 2016 at 04:58:02PM +0530, Vinod Koul wrote: > > On Mon, Sep 05, 2016 at 04:43:21PM +1000, Stephen Rothwell wrote: > > > Hi Greg, > > > > > > Today's linux-next merge of the tty tree got a conflict in: > > > > > > drivers/dma/imx-sdma.c > > > > > > between commit: > > > > > > 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function") > > > > > > from the slave-dma tree and commit: > > > > > > 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients") > > > > > > from the tty tree. > > > > > > I fixed it up (see below) 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. > > > > Stephen, > > > > The fix looks right to me. > > > > Greg let me know if you would like me to merge this to avoid conflict > > Sure, which way do you want to merge, do you want me to pull your tree > into mine, or do you want to pull my tree into yours? Either is fine > with me. Great, I would prefer to pull. -- ~Vinod