From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Rafael J. Wysocki" <rjw@sisk•pl>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
John Linn <john.linn@xilinx•com>,
Michal Simek <michal.simek@petalogix•com>,
Magnus Damm <damm@igel•co.jp>
Subject: linux-next: manual merge of the suspend tree with the microblaze tree
Date: Mon, 6 Jul 2009 14:00:50 +1000 [thread overview]
Message-ID: <20090706140050.0dec74a2.sfr@canb.auug.org.au> (raw)
Hi Rafael,
Today's linux-next merge of the suspend tree got a conflict in
arch/microblaze/include/asm/device.h between commit
19aff4132a289ec83ca6eee8b3db28855b9f06af ("microblaze: Adding
dev_arch_data functions") from the microblaze tree and commit
c959b4101b10723eeb190ef2e82765dd529c26b6 ("Driver Core: Add platform
device arch data V3") from the suspend tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
P.S. Michal, that microblaze commit has an invalid email address for the
Author (John Linn <linnj@xaqlinnj41.(none)>).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/microblaze/include/asm/device.h
index afa0987,30286db..0000000
--- a/arch/microblaze/include/asm/device.h
+++ b/arch/microblaze/include/asm/device.h
@@@ -16,18 -16,9 +16,21 @@@ struct dev_archdata
struct device_node *of_node;
};
+static inline void dev_archdata_set_node(struct dev_archdata *ad,
+ struct device_node *np)
+{
+ ad->of_node = np;
+}
+
+static inline struct device_node *
+dev_archdata_get_node(const struct dev_archdata *ad)
+{
+ return ad->of_node;
+}
+
+ struct pdev_archdata {
+ };
+
#endif /* _ASM_MICROBLAZE_DEVICE_H */
next reply other threads:[~2009-07-06 4:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-06 4:00 Stephen Rothwell [this message]
2009-07-06 7:19 ` linux-next: manual merge of the suspend tree with the microblaze tree Michal Simek
2009-07-06 7:21 ` Michal Simek
2009-07-06 21:32 ` Rafael J. Wysocki
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=20090706140050.0dec74a2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=damm@igel$(echo .)co.jp \
--cc=john.linn@xilinx$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michal.simek@petalogix$(echo .)com \
--cc=rjw@sisk$(echo .)pl \
/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