linux-next: manual merge of the driver-core tree

linux-next: manual merge of the driver-core tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit
24a99596f7465274a8e65ddd29a7d9028969b9f9 ("powerpc/85xx: Fix compile
warnings in mpc85xx_mds.c") from the galak tree and commit
f58f23751464d095f9942304bc5f6072b79a2cc3 ("powerpc: struct device -
replace bus_id with dev_name(), dev_set_name()") from the driver-core
tree.

I fixed it up (see below) and can carry the fix as necessary.

Paul, maybe you should apply the patch from the driver-core tree as it
was cc'd to you and all its prerequisites are upstream.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/powerpc/platforms/85xx/mpc85xx_mds.c
index b915bf5,80c55a5..0000000
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@@ -241,15 -241,13 +241,15 @@@ static int __init board_fixups(void
  		mdio = of_find_compatible_node(NULL, NULL, compstrs[i]);
  
  		of_address_to_resource(mdio, 0, &res);
- 		snprintf(phy_id, BUS_ID_SIZE, "%llx:%02x",
 -		snprintf(phy_id, sizeof(phy_id), "%x:%02x", res.start, 1);
++		snprintf(phy_id, sizeof(phy_id), "%llx:%02x",
 +			(unsigned long long)res.start, 1);
  
  		phy_register_fixup_for_id(phy_id, mpc8568_fixup_125_clock);
  		phy_register_fixup_for_id(phy_id, mpc8568_mds_phy_fixups);
  
  		/* Register a workaround for errata */
- 		snprintf(phy_id, BUS_ID_SIZE, "%llx:%02x",
 -		snprintf(phy_id, sizeof(phy_id), "%x:%02x", res.start, 7);
++		snprintf(phy_id, sizeof(phy_id), "%llx:%02x",
 +			(unsigned long long)res.start, 7);
  		phy_register_fixup_for_id(phy_id, mpc8568_mds_phy_fixups);
  
  		of_node_put(mdio);

Re: linux-next: manual merge of the driver-core tree

[Greg KH]

On Thu, Dec 04, 2008 at 10:44:18AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit
> 24a99596f7465274a8e65ddd29a7d9028969b9f9 ("powerpc/85xx: Fix compile
> warnings in mpc85xx_mds.c") from the galak tree and commit
> f58f23751464d095f9942304bc5f6072b79a2cc3 ("powerpc: struct device -
> replace bus_id with dev_name(), dev_set_name()") from the driver-core
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.
> 
> Paul, maybe you should apply the patch from the driver-core tree as it
> was cc'd to you and all its prerequisites are upstream.

Yes, Paul, please apply the patch, and let me know.  It will make things
much easier in the end for everyone involved.

thanks,

greg k-h

Re: linux-next: manual merge of the driver-core tree

[Paul Mackerras]

Greg KH writes:

> Yes, Paul, please apply the patch, and let me know.  It will make things
> much easier in the end for everyone involved.

Hmmm, I don't have it in my inbox, all I can find is an email from Kay
saying it had a problem.  Care to forward it to me?

Paul.

Re: linux-next: manual merge of the driver-core tree

[Greg KH]

On Thu, Dec 04, 2008 at 09:42:14PM +1100, Paul Mackerras wrote:
> Greg KH writes:
> 
> > Yes, Paul, please apply the patch, and let me know.  It will make things
> > much easier in the end for everyone involved.
> 
> Hmmm, I don't have it in my inbox, all I can find is an email from Kay
> saying it had a problem.  Care to forward it to me?

I'll resend them now.

thanks,

greg k-h

Re: linux-next: manual merge of the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]

Hi Greg,

On Wed, 3 Dec 2008 20:21:54 -0800 Greg KH <greg@kroah.com> wrote:
>
> On Thu, Dec 04, 2008 at 10:44:18AM +1100, Stephen Rothwell wrote:
> > 
> > Today's linux-next merge of the driver-core tree got a conflict in
> > arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit
> > 24a99596f7465274a8e65ddd29a7d9028969b9f9 ("powerpc/85xx: Fix compile
> > warnings in mpc85xx_mds.c") from the galak tree and commit
> > f58f23751464d095f9942304bc5f6072b79a2cc3 ("powerpc: struct device -
> > replace bus_id with dev_name(), dev_set_name()") from the driver-core
> > tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> > 
> > Paul, maybe you should apply the patch from the driver-core tree as it
> > was cc'd to you and all its prerequisites are upstream.
> 
> Yes, Paul, please apply the patch, and let me know.  It will make things
> much easier in the end for everyone involved.

It looks like this has been applied to the powerpc tree and is now in
Linus' tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the driver-core tree

[Greg KH]

On Mon, Jan 05, 2009 at 10:28:00AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Wed, 3 Dec 2008 20:21:54 -0800 Greg KH <greg@kroah.com> wrote:
> >
> > On Thu, Dec 04, 2008 at 10:44:18AM +1100, Stephen Rothwell wrote:
> > > 
> > > Today's linux-next merge of the driver-core tree got a conflict in
> > > arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit
> > > 24a99596f7465274a8e65ddd29a7d9028969b9f9 ("powerpc/85xx: Fix compile
> > > warnings in mpc85xx_mds.c") from the galak tree and commit
> > > f58f23751464d095f9942304bc5f6072b79a2cc3 ("powerpc: struct device -
> > > replace bus_id with dev_name(), dev_set_name()") from the driver-core
> > > tree.
> > > 
> > > I fixed it up (see below) and can carry the fix as necessary.
> > > 
> > > Paul, maybe you should apply the patch from the driver-core tree as it
> > > was cc'd to you and all its prerequisites are upstream.
> > 
> > Yes, Paul, please apply the patch, and let me know.  It will make things
> > much easier in the end for everyone involved.
> 
> It looks like this has been applied to the powerpc tree and is now in
> Linus' tree.

Thanks for letting me know, I'll drop it from my tree when I sync up
with Linus's tree tomorrow.

greg k-h

Re: linux-next: manual merge of the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

Hi Greg,

On Sun, 4 Jan 2009 20:36:46 -0800 Greg KH <greg@kroah.com> wrote:
>
> Thanks for letting me know, I'll drop it from my tree when I sync up
> with Linus's tree tomorrow.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]