linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Wei Yongjun <yongjun_wei@trendmicro.com.cn>,
	Tony Prisk <linux@prisktech.co.nz>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree
Date: Fri, 25 Jan 2013 12:57:09 -0800	[thread overview]
Message-ID: <20130125205709.GA22336@kroah.com> (raw)
In-Reply-To: <20130121144604.3c2f94e93ce6252aa43d3d9e@canb.auug.org.au>

On Mon, Jan 21, 2013 at 02:46:04PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/vt8500_serial.c between commit a6dd114e16cb ("tty:
> serial: vt8500: fix return value check in vt8500_serial_probe()") from
> Linus' tree and commit 12faa35ae5cb ("serial: vt8500: UART uses gated
> clock rather than 24Mhz reference") from the tty tree.
> 
> I fixed it up (I just used the tty tree version - which included the
> former fix) and can carry the fix as necessary (no action is required).

This should be resolved in the next pull of my tree.

thanks,

greg k-h

  parent reply	other threads:[~2013-01-25 20:57 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-21  3:46 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:57 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-10  3:40 Stephen Rothwell
2020-03-10  9:04 ` Greg KH
2020-03-10 10:52   ` Jiri Slaby
2020-03-16  6:38   ` Jiri Slaby
2020-03-16  7:46     ` Greg KH
2020-03-16  6:34 ` Jiri Slaby
2016-05-20  2:31 Stephen Rothwell
2016-05-21  3:26 ` Greg KH
2014-05-05  5:41 Stephen Rothwell
2014-05-05 21:02 ` Greg KH
2013-01-17  2:04 Stephen Rothwell
2013-01-18  0:41 ` Greg KH
2011-10-25  8:18 Stephen Rothwell
2011-10-25 10:03 ` Nicolas Ferre
2011-10-25  8:12 Stephen Rothwell
2011-10-25 12:02 ` Greg KH
2011-02-24  5:34 Stephen Rothwell
2011-02-24 19:39 ` Greg KH
2011-02-25  5:11   ` Stephen Rothwell
2011-02-25  5:48     ` Greg KH

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=20130125205709.GA22336@kroah.com \
    --to=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@prisktech.co.nz \
    --cc=sfr@canb.auug.org.au \
    --cc=yongjun_wei@trendmicro.com.cn \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).