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
Subject: linux-next: manual merge of the devicetree tree with the devicetree-current tree
Date: Thu, 20 Nov 2014 14:50:16 +1100 [thread overview]
Message-ID: <20141120145016.19160b8b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1692 bytes --]
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
drivers/of/unittest.c between commit 817d2001c709 ("of/selftest: Fix
testing when /aliases is missing") from the devicetree-current tree and
commit 5063e25a302e ("of: Eliminate of_allnodes list") from the
devicetree tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/of/unittest.c
index ae8b75904104,082bb2b6a5ad..000000000000
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@@ -853,19 -858,20 +858,23 @@@ static int __init selftest_data_add(voi
for_each_of_allnodes(np)
__of_attach_node_sysfs(np);
- of_aliases = of_find_node_by_path("/aliases");
- of_chosen = of_find_node_by_path("/chosen");
- return 0;
+ } else {
+ /* attach the sub-tree to live tree */
- rc = attach_node_and_children(selftest_data_node);
- if (WARN_ON(rc))
- return rc;
++ np = selftest_data_node->child;
++ while (np) {
++ struct device_node *next = np->sibling;
++ np->parent = of_root;
++ attach_node_and_children(np);
++ np = next;
++ }
}
- /* attach the sub-tree to live tree */
- np = selftest_data_node->child;
- while (np) {
- struct device_node *next = np->sibling;
- np->parent = of_root;
- attach_node_and_children(np);
- np = next;
- }
+ /* Make sure of_aliases and of_chosen are up-to-date */
+ if (!of_aliases)
+ of_aliases = of_find_node_by_path("/aliases");
+ if (!of_chosen)
+ of_chosen = of_find_node_by_path("/chosen");
- return rc;
+ return 0;
}
/**
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-20 3:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-20 3:50 Stephen Rothwell [this message]
2014-11-20 14:44 ` linux-next: manual merge of the devicetree tree with the devicetree-current tree Grant Likely
-- strict thread matches above, loose matches on Subject: below --
2014-11-21 4:05 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=20141120145016.19160b8b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=grant.likely@secretlab$(echo .)ca \
--cc=linux-kernel@vger$(echo .)kernel.org \
--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