Re: linux-next: manual merge of the tty tree with the slave-dma tree

2016-09-09 Thread Greg KH
On Fri, Sep 09, 2016 at 05:23:54PM +0530, Vinod Koul wrote: > On Mon, Sep 05, 2016 at 09:23:21PM +0530, Vinod Koul wrote: > > On Mon, Sep 05, 2016 at 03:55:41PM +0200, Greg KH wrote: > > > On Mon, Sep 05, 2016 at 06:13:05PM +0530, Vinod Koul wrote: > > > > > > Stephen, > > > > > > > > > > > > The

Re: linux-next: manual merge of the tty tree with the slave-dma tree

2016-09-09 Thread Vinod Koul
On Mon, Sep 05, 2016 at 09:23:21PM +0530, Vinod Koul wrote: > On Mon, Sep 05, 2016 at 03:55:41PM +0200, Greg KH wrote: > > On Mon, Sep 05, 2016 at 06:13:05PM +0530, Vinod Koul wrote: > > > > > Stephen, > > > > > > > > > > The fix looks right to me. > > > > > > > > > > Greg let me know if you woul

Re: linux-next: manual merge of the tty tree with the slave-dma tree

2016-09-05 Thread Vinod Koul
On Mon, Sep 05, 2016 at 03:55:41PM +0200, Greg KH wrote: > On Mon, Sep 05, 2016 at 06:13:05PM +0530, Vinod Koul wrote: > > > > 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

Re: linux-next: manual merge of the tty tree with the slave-dma tree

2016-09-05 Thread Greg KH
On Mon, Sep 05, 2016 at 06:13:05PM +0530, Vinod Koul wrote: > 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 li

Re: linux-next: manual merge of the tty tree with the slave-dma tree

2016-09-05 Thread Vinod Koul
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

Re: linux-next: manual merge of the tty tree with the slave-dma tree

2016-09-05 Thread Greg KH
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 ("dmae

Re: linux-next: manual merge of the tty tree with the slave-dma tree

2016-09-05 Thread Vinod Koul
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 t

Re: linux-next: manual merge of the tty tree with the slave-dma tree

2015-04-07 Thread Geert Uytterhoeven
On Tue, Apr 7, 2015 at 11:28 AM, Stephen Rothwell wrote: > --- a/drivers/dma/Kconfig > +++ b/drivers/dma/Kconfig > @@@ -112,17 -125,8 +112,19 @@@ config FSL_DM > EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 is on > some Txxx and Bxxx parts. > > +config FSL_RA

Re: linux-next: manual merge of the tty tree with the slave-dma tree

2015-04-07 Thread Greg KH
On Tue, Apr 07, 2015 at 07:28:08PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/dma/Kconfig between commit ad80da658bbc ("dmaengine: Driver > support for FSL RaidEngine device") from the slave-dma tree and commit > 2b49e0c56741