From: Michal Simek <michal.simek@petalogix.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the microblaze tree with Linus' tree
Date: Tue, 09 Feb 2010 09:18:39 +0100 [thread overview]
Message-ID: <4B711A5F.7020304@petalogix.com> (raw)
In-Reply-To: <20100209110710.c7b6992b.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Michal,
>
> Today's linux-next merge of the microblaze tree got a conflict in
> arch/microblaze/kernel/setup.c between commit
> a6013411118a6c8c34f1bd8b047b36fdf9711590 ("microblaze: Invalidate dcache
> before enabling it") from Linus' tree and commit
> 578059c56c816db2b696a196d3656afc187c7edd ("microblaze: Move cache
> function to cache.c") from the microblaze tree.
>
> The microblaze tree version supercedes the version from Linus' tree, so I
> used that.
Yes, I know about. I am fixing it.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
PetaLogix - Linux Solutions for a Reconfigurable World
w: www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663
next prev parent reply other threads:[~2010-02-09 8:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-09 0:07 linux-next: manual merge of the microblaze tree with Linus' tree Stephen Rothwell
2010-02-09 8:18 ` Michal Simek [this message]
2010-02-09 10:46 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-07-26 1:46 Stephen Rothwell
2013-05-09 0:35 Stephen Rothwell
2013-05-09 6:55 ` Michal Simek
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=4B711A5F.7020304@petalogix.com \
--to=michal.simek@petalogix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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.