From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Andres Salomon <dilinger@queued.net>
Subject: linux-next: manual merge of the devicetree tree with Linus' tree
Date: Fri, 16 Jul 2010 11:15:20 +1000 [thread overview]
Message-ID: <20100716111520.732bd29a.sfr@canb.auug.org.au> (raw)
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/sparc/kernel/prom_64.c between commit
95f72d1ed41a66f1c1c29c24d479de81a0bea36f ("lmb: rename to memblock") from
Linus' tree and commit 035ebefc737cce56d3938e9b7eaa5ac0e9c28715
("of/sparc: move is_root_node() to of.h") from the devicetree tree.
Just context changes. I fixed it up (see below) and can carry the fix for
a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/sparc/kernel/prom_64.c
index 466a327,0bffafd..0000000
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@@ -20,8 -20,8 +20,8 @@@
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/module.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
- #include <linux/of_device.h>
+ #include <linux/of.h>
#include <asm/prom.h>
#include <asm/oplib.h>
next reply other threads:[~2010-07-16 1:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-16 1:15 Stephen Rothwell [this message]
2010-07-16 4:27 ` linux-next: manual merge of the devicetree tree with Linus' tree Grant Likely
-- strict thread matches above, loose matches on Subject: below --
2025-02-26 2:07 Stephen Rothwell
2025-02-26 2:41 ` Zijun Hu
2024-04-16 3:42 Stephen Rothwell
2022-01-14 23:41 Stephen Rothwell
2020-10-15 3:21 Stephen Rothwell
2019-11-12 2:57 Stephen Rothwell
2019-10-16 1:25 Stephen Rothwell
2019-07-24 3:02 Stephen Rothwell
2019-07-24 19:31 ` Rob Herring
2019-06-24 5:51 Stephen Rothwell
2019-07-08 23:56 ` Stephen Rothwell
2019-02-14 3:02 Stephen Rothwell
2017-09-06 3:01 Stephen Rothwell
2017-09-06 2:55 Stephen Rothwell
2011-08-05 2:13 Stephen Rothwell
2010-06-07 2:53 Stephen Rothwell
2010-06-07 17:03 ` 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=20100716111520.732bd29a.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=dilinger@queued.net \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yinghai@kernel.org \
/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