From: Greg KH <greg@kroah.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-kernel@vger.kernel.org,
Venu Byravarasu <vbyravarasu@nvidia.com>,
Felipe Balbi <balbi@ti.com>,
Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>,
Will Deacon <will.deacon@arm.com>
Subject: Re: linux-next: manual merge of the tegra tree with the tree
Date: Wed, 12 Sep 2012 09:12:19 -0700 [thread overview]
Message-ID: <20120912161219.GB7273@kroah.com> (raw)
In-Reply-To: <20120912164353.6fb8b35ff534088a79792acd@canb.auug.org.au>
On Wed, Sep 12, 2012 at 04:43:53PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tegra tree got a conflict in
> arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
> commits 2db4ddfe6e23 ("ARM: pmu: remove arm_pmu_type enumeration") from
> the arm-perf tree and 1ba8216f0bc0 ("usb: move phy driver from mach-tegra
> to drivers/usb") from the usb tree and commit ba07ee57d4bc ("ARM: tegra:
> remove dead code") from the tegra tree.
>
> The latter removed the files, so I did that (no action is required).
Stephen (Warren that is), should be fixing this up in his tree soon, as
he will be including the same patchset that caused this problem in his
tree to resolve this.
thanks,
greg k-h
next prev parent reply other threads:[~2012-09-12 16:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 6:43 linux-next: manual merge of the tegra tree with the tree Stephen Rothwell
2012-09-12 16:12 ` Greg KH [this message]
2012-09-12 16:14 ` Stephen Warren
-- strict thread matches above, loose matches on Subject: below --
2013-01-09 2:58 Stephen Rothwell
2013-01-09 11:48 ` Will Deacon
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=20120912161219.GB7273@kroah.com \
--to=greg@kroah.com \
--cc=Sudeep.KarkadaNagesha@arm.com \
--cc=balbi@ti.com \
--cc=ccross@android.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 \
--cc=vbyravarasu@nvidia.com \
--cc=will.deacon@arm.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).