linux-next: manual merge of the suspend tree with the microblazetree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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 */
  
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/