All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vinod Koul <vinod.koul@intel.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nandor Han <nandor.han@ge.com>, Dave Jiang <dave.jiang@intel.com>
Subject: Re: linux-next: manual merge of the tty tree with the slave-dma tree
Date: Fri, 9 Sep 2016 17:23:54 +0530	[thread overview]
Message-ID: <20160909115354.GR9355@localhost> (raw)
In-Reply-To: <20160905155321.GT9355@localhost>

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

  reply	other threads:[~2016-09-09 11:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-05  6:43 linux-next: manual merge of the tty tree with the slave-dma tree Stephen Rothwell
2016-09-05 11:28 ` Vinod Koul
2016-09-05 11:33   ` Greg KH
2016-09-05 12:43     ` Vinod Koul
2016-09-05 13:55       ` Greg KH
2016-09-05 15:53         ` Vinod Koul
2016-09-09 11:53           ` Vinod Koul [this message]
2016-09-09 12:20             ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2015-04-07  9:28 Stephen Rothwell
2015-04-07  9:52 ` Greg KH
2015-04-07 12:27 ` Geert Uytterhoeven
2014-09-30  7:26 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160909115354.GR9355@localhost \
    --to=vinod.koul@intel.com \
    --cc=dave.jiang@intel.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nandor.han@ge.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.