linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Will Deacon <will.deacon@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Stephen Warren <swarren@nvidia.com>,
	Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Dietmar Eggemann <Dietmar.Eggemann@arm.com>,
	Joseph Lo <josephl@nvidia.com>
Subject: Re: linux-next: manual merge of the tegra tree with the  tree
Date: Wed, 9 Jan 2013 11:48:57 +0000	[thread overview]
Message-ID: <20130109114856.GC1462@mudshark.cambridge.arm.com> (raw)
In-Reply-To: <20130109135816.2d65e46e24391fb56a09fd76@canb.auug.org.au>

On Wed, Jan 09, 2013 at 02:58:16AM +0000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tegra tree got a conflict in
> arch/arm/mach-tegra/headsmp.S between commit bc4f1bdabc89 ("ARM:
> coresight: common definition for (OS) Lock Access Register key value")
> from the arm-perf tree and commit 2a3eb5bc45bd ("ARM: tegra: make device
> can run on UP") from the tegra tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Argh, given that these two trees won't likely meet outside of next until
they hit torvalds, I'll just drop my tegra change from hw-breakpoint as it's
only cosmetic. I can requeue it via Stephen later on.

Thanks,

Will

  reply	other threads:[~2013-01-09 11:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-09  2:58 linux-next: manual merge of the tegra tree with the tree Stephen Rothwell
2013-01-09 11:48 ` Will Deacon [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-09-12  6:43 Stephen Rothwell
2012-09-12 16:12 ` Greg KH
2012-09-12 16:14   ` Stephen Warren
2011-12-09  0:47 Stephen Rothwell
2011-12-09  4:37 ` Stephen Warren
2011-12-09  5:45   ` 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=20130109114856.GC1462@mudshark.cambridge.arm.com \
    --to=will.deacon@arm.com \
    --cc=Dietmar.Eggemann@arm.com \
    --cc=ccross@android.com \
    --cc=josephl@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    --cc=swarren@nvidia.com \
    /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).