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

From: Vinod Koul
Date: Fri Sep 09 2016 - 07:45:45 EST


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 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.
> >
> > Do you want a signed tag, or do you just want to pull my tty-next branch
> > directly into your tree?
>
> Signed tag would be better

Hi Greg,

Can you please send a tag for this

Thanks
--
~Vinod