All of lore.kernel.org
 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,
	Marc Zyngier <marc.zyngier@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree
Date: Mon, 5 May 2014 14:02:11 -0700	[thread overview]
Message-ID: <20140505210211.GA27503@kroah.com> (raw)
In-Reply-To: <20140505154103.941b62e29706efa62b826354@canb.auug.org.au>

On Mon, May 05, 2014 at 03:41:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> arch/arm64/kernel/early_printk.c between commit f774b7d10e21 ("arm64:
> fixmap: fix missing sub-page offset for earlyprintk") from the  tree and
> commit 8ef0ed95ee04 ("arm64: remove arch specific earlyprintk") from the
> tty tree.
> 
> I fixed it up (I removed the file) and can carry the fix as necessary (no
> action is required).

That sounds fine to me, thanks.

greg k-h

  reply	other threads:[~2014-05-05 20:59 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-05  5:41 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2014-05-05 21:02 ` 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
2013-01-21  3:46 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:57 ` 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=20140505210211.GA27503@kroah.com \
    --to=greg@kroah.com \
    --cc=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=robh@kernel.org \
    --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.