Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1476575

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

From Vinod Koul <vinod.koul@intel.com>
Newsgroups linux.kernel
Subject Re: linux-next: manual merge of the tty tree with the slave-dma tree
Date 2016-09-05 17:50 +0200
Message-ID <se4jM-5El-13@gated-at.bofh.it> (permalink)
References <sdVTb-6R-3@gated-at.bofh.it> <se0ga-34H-17@gated-at.bofh.it> <se0pQ-381-31@gated-at.bofh.it> <se1lU-3KI-21@gated-at.bofh.it> <se2Bj-4t4-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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

Thanks
-- 
~Vinod

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the tty tree with the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-09-05 08:50 +0200
  Re: linux-next: manual merge of the tty tree with the slave-dma tree Vinod Koul <vinod.koul@intel.com> - 2016-09-05 13:30 +0200
    Re: linux-next: manual merge of the tty tree with the slave-dma tree Greg KH <greg@kroah.com> - 2016-09-05 13:40 +0200
      Re: linux-next: manual merge of the tty tree with the slave-dma tree Vinod Koul <vinod.koul@intel.com> - 2016-09-05 14:40 +0200
        Re: linux-next: manual merge of the tty tree with the slave-dma tree Greg KH <greg@kroah.com> - 2016-09-05 16:00 +0200
          Re: linux-next: manual merge of the tty tree with the slave-dma tree Vinod Koul <vinod.koul@intel.com> - 2016-09-05 17:50 +0200
            Re: linux-next: manual merge of the tty tree with the slave-dma tree Vinod Koul <vinod.koul@intel.com> - 2016-09-09 13:50 +0200
              Re: linux-next: manual merge of the tty tree with the slave-dma tree Greg KH <greg@kroah.com> - 2016-09-09 14:30 +0200

csiph-web