From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Michal Simek <michal.simek@petalogix.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the microblaze tree
Date: Tue, 16 Feb 2010 14:38:04 -0700 [thread overview]
Message-ID: <fa686aa41002161338u25e58cc5m74e4b3c6e39b584b@mail.gmail.com> (raw)
In-Reply-To: <20100215181335.f53ad8a0.sfr@canb.auug.org.au>
On Mon, Feb 15, 2010 at 12:13 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/microblaze/include/asm/prom.h between commit
> 8d0fd5d72f5bcc597427afd73c6d5ba97fe4780f ("microblaze: Enable PCI,
> missing files") from the microblaze tree and commit
> df0edeb59eb559be0bee53452fda2f5cc0ae133f ("of: remove undefined
> request_OF_resource & release_OF_resource") from the devicetree tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Michal, with respect to the current ongoing discussion, I hope you're
not planning on merging the microblaze PCI patches when Linus opens
the merge window.
g.
next prev parent reply other threads:[~2010-02-16 21:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-15 7:13 Stephen Rothwell
2010-02-16 21:38 ` Grant Likely [this message]
2010-07-27 3:17 Stephen Rothwell
2010-07-27 3:19 ` Grant Likely
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=fa686aa41002161338u25e58cc5m74e4b3c6e39b584b@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.simek@petalogix.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®