lkml.org 
[lkml]   [2016]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tty tree with the slave-dma tree
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

--
~Vinod

\
 
 \ /
  Last update: 2016-09-17 09:58    [W:0.058 / U:1.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site