From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Michal Simek <michal.simek@petalogix•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the microblaze tree with Linus' tree
Date: Tue, 9 Feb 2010 11:07:10 +1100 [thread overview]
Message-ID: <20100209110710.c7b6992b.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-02-09 0:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-09 0:07 Stephen Rothwell [this message]
2010-02-09 8:18 ` linux-next: manual merge of the microblaze tree with Linus' tree Michal Simek
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=20100209110710.c7b6992b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michal.simek@petalogix$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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