From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>
Cc: linux-next@vger•kernel.org
Subject: linux-next: manual merge of the sparc tree
Date: Thu, 4 Sep 2008 11:17:17 +1000 [thread overview]
Message-ID: <20080904111717.8aec7545.sfr@canb.auug.org.au> (raw)
Hi Dave,
Today's linux-next merge of the sparc tree got a conflict in
arch/sparc/kernel/of_device.c between commit
e3c71a32915fabb095de7108c22672e457631a08 ("sparc: Fix resource flags for
PCI children in OF device tree") from Linus' tree and commit
5280267c1dddb8d413595b87dc406624bb497946 ("sparc: Fix handling of LANCE
and ESP parent nodes in of_device.c") from the sparc tree.
The former just changed the context of the latter. I fixed it up (see
below).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/sparc/kernel/of_device.c
index c481d45,4ef1607..0000000
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@@ -371,12 -409,8 +415,9 @@@ static void __init build_device_resourc
memcpy(addr, reg, na * 4);
+ flags = bus->get_flags(reg, 0);
+
- /* If the immediate parent has no ranges property to apply,
- * just use a 1<->1 mapping.
- */
- if (of_find_property(pp, "ranges", NULL) == NULL) {
+ if (use_1to1_mapping(pp)) {
result = of_read_addr(addr, na);
goto build_res;
}
next reply other threads:[~2008-09-04 1:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-04 1:17 Stephen Rothwell [this message]
2008-09-04 1:17 ` linux-next: manual merge of the sparc tree David Miller
2008-09-04 4:14 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-09-16 20:27 Stephen Rothwell
2008-09-16 21:31 ` David Miller
2008-09-16 21:40 ` Stephen Rothwell
2008-07-16 7:39 Stephen Rothwell
2008-07-18 6:07 ` David Miller
2008-07-16 7:31 Stephen Rothwell
2008-07-16 7:19 Stephen Rothwell
2008-07-16 7:23 ` 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=20080904111717.8aec7545.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
/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