2009-07-06 04:00:59

by Stephen Rothwell

Subject: linux-next: manual merge of the suspend tree with the microblaze tree

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 [email protected]

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 */

2009-07-06 07:19:31

by Michal Simek

Subject: Re: linux-next: manual merge of the suspend tree with the microblaze tree

Stephen Rothwell wrote:
> 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)>).
>
Yes, I see. I'll rebase that branch and I fix it.

Thanks,
Michal

--
Michal Simek, Ing. (M.Eng)
PetaLogix - Linux Solutions for a Reconfigurable World
w: http://www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663

2009-07-06 07:21:23

by Michal Simek

Subject: Re: linux-next: manual merge of the suspend tree with the microblaze tree

Stephen Rothwell wrote:
> 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.
>
I'll revert this patch and I'll add it later.
Rafael you don't need to do any changes. I'll do them.
This John L patch is not important - just for any drivers which are not
in mainline.
I'll add it later.

Thanks,
Michal


> P.S. Michal, that microblaze commit has an invalid email address for the
> Author (John Linn <linnj@xaqlinnj41.(none)>).
>


--
Michal Simek, Ing. (M.Eng)
PetaLogix - Linux Solutions for a Reconfigurable World
w: http://www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663

2009-07-06 21:32:19

by Rafael J. Wysocki

Subject: Re: linux-next: manual merge of the suspend tree with the microblaze tree

On Monday 06 July 2009, Michal Simek wrote:
> Stephen Rothwell wrote:
> > 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.
> >
> I'll revert this patch and I'll add it later.
> Rafael you don't need to do any changes. I'll do them.
> This John L patch is not important - just for any drivers which are not
> in mainline.
> I'll add it later.

Many thanks!

Best,
Rafael