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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got conflicts in 58
files due to the partial merge into Linus' tree of the driver-core tree.
The conflicts were all caused by the renamed of device_create_drvdata()
to device_create() so I took the driver-core versions of almost all those
files.  The exceptions were drivers/char/tty_io.c,
drivers/char/istallion.c, drivers/char/stallion.c and
drivers/isdn/capi/capi.c which required a manual merge (I applied the
rename by hand on top of the upstream version of the file in each case).
Someone might like to check that I have it all right when I publish the
tree.

Hopefully this will be fixed up soon.

-- 
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 Wed, Jul 23, 2008 at 11:31:35AM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got conflicts in 58
> files due to the partial merge into Linus' tree of the driver-core tree.
> The conflicts were all caused by the renamed of device_create_drvdata()
> to device_create() so I took the driver-core versions of almost all those
> files.  The exceptions were drivers/char/tty_io.c,
> drivers/char/istallion.c, drivers/char/stallion.c and
> drivers/isdn/capi/capi.c which required a manual merge (I applied the
> rename by hand on top of the upstream version of the file in each case).
> Someone might like to check that I have it all right when I publish the
> tree.

Thanks, I'll take a look.

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

On Wed, 23 Jul 2008 11:31:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got conflicts in 58
> files due to the partial merge into Linus' tree of the driver-core tree.
> The conflicts were all caused by the renamed of device_create_drvdata()
> to device_create() so I took the driver-core versions of almost all those
> files.  The exceptions were drivers/char/tty_io.c,
> drivers/char/istallion.c, drivers/char/stallion.c and
> drivers/isdn/capi/capi.c which required a manual merge (I applied the
> rename by hand on top of the upstream version of the file in each case).
> Someone might like to check that I have it all right when I publish the
> tree.
> 
> Hopefully this will be fixed up soon.

I think one way to avoid this in the future would be to move all the
patches that you have asked Linus to merge into the driver-core.current
series immediately you make the request (or even before).  That would
separate my merge of the patches that are identical on both sides from
the patches that further change the same files.

-- 
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 Wed, Jul 23, 2008 at 06:09:26PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Wed, 23 Jul 2008 11:31:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the driver-core tree got conflicts in 58
> > files due to the partial merge into Linus' tree of the driver-core tree.
> > The conflicts were all caused by the renamed of device_create_drvdata()
> > to device_create() so I took the driver-core versions of almost all those
> > files.  The exceptions were drivers/char/tty_io.c,
> > drivers/char/istallion.c, drivers/char/stallion.c and
> > drivers/isdn/capi/capi.c which required a manual merge (I applied the
> > rename by hand on top of the upstream version of the file in each case).
> > Someone might like to check that I have it all right when I publish the
> > tree.
> > 
> > Hopefully this will be fixed up soon.
> 
> I think one way to avoid this in the future would be to move all the
> patches that you have asked Linus to merge into the driver-core.current
> series immediately you make the request (or even before).  That would
> separate my merge of the patches that are identical on both sides from
> the patches that further change the same files.

Ah, that might help, but only if you hit the same pull window like we
did this time.  That's usually rare.  I'll do this the next time.

thanks,

greg k-h

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

[Greg Kroah-Hartman]

On Tue, Oct 01, 2013 at 01:07:20PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the driver-core tree got conflicts in
> 
> 	include/linux/netdevice.h
> 
> I fixed it up (see below). Please check if the resolution looks correct.

Looks correct to me, thanks.

greg k-h

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

[Thierry Reding]

Today's linux-next merge of the driver-core tree got conflicts in

	include/linux/netdevice.h

I fixed it up (see below). Please check if the resolution looks correct.

Thanks,
Thierry
---
diff --cc drivers/mtd/nand/atmel_nand.c
index ef9c9f5,bd1ce7d..2dbd913
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@@ -1511,8 -1540,15 +1511,8 @@@ static int atmel_of_init_port(struct at
  
  	return 0;
  }
 -#else
 -static int atmel_of_init_port(struct atmel_nand_host *host,
 -			      struct device_node *np)
 -{
 -	return -EINVAL;
 -}
 -#endif
  
- static int __init atmel_hw_nand_init_params(struct platform_device *pdev,
+ static int atmel_hw_nand_init_params(struct platform_device *pdev,
  					 struct atmel_nand_host *host)
  {
  	struct mtd_info *mtd = &host->mtd;
diff --cc drivers/net/bonding/bond_sysfs.c
index e06c644,ec9b646..6f5f413
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@@ -165,9 -157,43 +157,8 @@@ static const struct class_attribute cla
  	},
  	.show = bonding_show_bonds,
  	.store = bonding_store_bonds,
- 	.namespace = bonding_namespace,
  };
  
 -int bond_create_slave_symlinks(struct net_device *master,
 -			       struct net_device *slave)
 -{
 -	char linkname[IFNAMSIZ+7];
 -	int ret = 0;
 -
 -	/* first, create a link from the slave back to the master */
 -	ret = sysfs_create_link(&(slave->dev.kobj), &(master->dev.kobj),
 -				"master");
 -	if (ret)
 -		return ret;
 -	/* next, create a link from the master to the slave */
 -	sprintf(linkname, "slave_%s", slave->name);
 -	ret = sysfs_create_link(&(master->dev.kobj), &(slave->dev.kobj),
 -				linkname);
 -
 -	/* free the master link created earlier in case of error */
 -	if (ret)
 -		sysfs_remove_link(&(slave->dev.kobj), "master");
 -
 -	return ret;
 -
 -}
 -
 -void bond_destroy_slave_symlinks(struct net_device *master,
 -				 struct net_device *slave)
 -{
 -	char linkname[IFNAMSIZ+7];
 -
 -	sysfs_remove_link(&(slave->dev.kobj), "master");
 -	sprintf(linkname, "slave_%s", slave->name);
 -	sysfs_remove_link(&(master->dev.kobj), linkname);
 -}
 -
 -
  /*
   * Show the slaves in the current bond.
   */
diff --cc include/linux/netdevice.h
index f5cd464,42421ed..51fdaf6
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2893,8 -2873,20 +2893,20 @@@ int __init dev_proc_init(void)
  #define dev_proc_init() 0
  #endif
  
- int netdev_class_create_file(struct class_attribute *class_attr);
- void netdev_class_remove_file(struct class_attribute *class_attr);
 -extern int netdev_class_create_file_ns(struct class_attribute *class_attr,
 -				       const void *ns);
 -extern void netdev_class_remove_file_ns(struct class_attribute *class_attr,
 -					const void *ns);
++int netdev_class_create_file_ns(struct class_attribute *class_attr,
++				const void *ns);
++void netdev_class_remove_file_ns(struct class_attribute *class_attr,
++				 const void *ns);
+ 
+ static inline int netdev_class_create_file(struct class_attribute *class_attr)
+ {
+ 	return netdev_class_create_file_ns(class_attr, NULL);
+ }
+ 
+ static inline void netdev_class_remove_file(struct class_attribute *class_attr)
+ {
+ 	netdev_class_remove_file_ns(class_attr, NULL);
+ }
  
  extern struct kobj_ns_type_operations net_ns_type_operations;
  

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 --]

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: 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 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

[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 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

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

[Stephen Rothwell]

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

Hi Catalin,

On Mon, 01 Dec 2008 17:32:51 +0000 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> On Mon, 2008-12-01 at 11:15 +1100, Stephen Rothwell wrote:
> > Today's linux-next merge of the driver-core tree got a conflict in
> > drivers/mtd/maps/integrator-flash.c between commit
> > ffc86cf850dcd0e181a69c6fa0217d6c7ddf9c85 ("Add armflash support for
> > multiple blocks of flash") from the arm tree and commit
> > 0b1ea7e6450b3cc2e87d1c7295439483d007bb6e ("mtd: struct device - replace
> > bus_id with dev_name(), dev_set_name()") from the driver-core tree.
> > 
> > I fixed it up (see below).  
> 
> I'll send a separate patch on linux-mtd to make the third argument of
> mtd_concat_create a "const char *" to avoid a warning (dev_name returns
> const char *).

That would be good.

> > Maybe you, Russell and David Woodhouse could
> > sort out who should coordinate these updates.
> 
> I dropped the patch from my series and I suspect Russell will re-merge
> my tree (there shouldn't be other conflicts via the arm tree).
> 
> Now the question, where should I send the changes to integrator-flash.c
> to? I assume it's linux-mtd with ack from Russell.

I would guess that makes sense.

> Anyway, no matter who'll merge it, as long as it is based on the
> mainline kernel it will create a conflict in linux-next. Is the rule
> that there shouldn't be any conflicts in linux-next at this stage? The
> alternative is to get it merged via the driver-core tree.

There will always be conflicts between trees in linux-next.  My concern
is to try to minimise them if possible.  I can carry fixes to the merges
I do without to much pain and presumably Linus can cope with anything I
can.  Conflicts against Linus' tree should be fixed as soon as makes
sense, but some conflicts between the other constituent trees of
linux-next can only be resolved during the next merge window.

(I usually put "and I can carry the fix as necessary" in my messages, but
I missed that in this case, sorry).
-- 
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

[Catalin Marinas]

On Mon, 2008-12-01 at 11:15 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mtd/maps/integrator-flash.c between commit
> ffc86cf850dcd0e181a69c6fa0217d6c7ddf9c85 ("Add armflash support for
> multiple blocks of flash") from the arm tree and commit
> 0b1ea7e6450b3cc2e87d1c7295439483d007bb6e ("mtd: struct device - replace
> bus_id with dev_name(), dev_set_name()") from the driver-core tree.
> 
> I fixed it up (see below).  

I'll send a separate patch on linux-mtd to make the third argument of
mtd_concat_create a "const char *" to avoid a warning (dev_name returns
const char *).

> Maybe you, Russell and David Woodhouse could
> sort out who should coordinate these updates.

I dropped the patch from my series and I suspect Russell will re-merge
my tree (there shouldn't be other conflicts via the arm tree).

Now the question, where should I send the changes to integrator-flash.c
to? I assume it's linux-mtd with ack from Russell.

Anyway, no matter who'll merge it, as long as it is based on the
mainline kernel it will create a conflict in linux-next. Is the rule
that there shouldn't be any conflicts in linux-next at this stage? The
alternative is to get it merged via the driver-core tree.

Thanks.

-- 
Catalin

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

[Catalin Marinas]

On Mon, 2008-12-01 at 09:23 +0000, Russell King wrote:
> On Mon, Dec 01, 2008 at 11:15:52AM +1100, Stephen Rothwell wrote:
> > Today's linux-next merge of the driver-core tree got a conflict in
> > drivers/mtd/maps/integrator-flash.c between commit
> > ffc86cf850dcd0e181a69c6fa0217d6c7ddf9c85 ("Add armflash support for
> > multiple blocks of flash") from the arm tree and commit
> > 0b1ea7e6450b3cc2e87d1c7295439483d007bb6e ("mtd: struct device - replace
> > bus_id with dev_name(), dev_set_name()") from the driver-core tree.
> > 
> > I fixed it up (see below).  Maybe you, Russell and David Woodhouse could
> > sort out who should coordinate these updates.
> 
> Or maybe Catalin rather than me.

Sorry for this, I didn't follow the linux-next tree. I sent the patch to
Russell as he wrote the initial driver but I should have cc'ed David W.
as well.

The fix looks alright. Should I resend an updated patch?

Thanks.

-- 
Catalin

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

[Russell King]

On Mon, Dec 01, 2008 at 11:15:52AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mtd/maps/integrator-flash.c between commit
> ffc86cf850dcd0e181a69c6fa0217d6c7ddf9c85 ("Add armflash support for
> multiple blocks of flash") from the arm tree and commit
> 0b1ea7e6450b3cc2e87d1c7295439483d007bb6e ("mtd: struct device - replace
> bus_id with dev_name(), dev_set_name()") from the driver-core tree.
> 
> I fixed it up (see below).  Maybe you, Russell and David Woodhouse could
> sort out who should coordinate these updates.

Or maybe Catalin rather than me.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

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
drivers/mtd/maps/integrator-flash.c between commit
ffc86cf850dcd0e181a69c6fa0217d6c7ddf9c85 ("Add armflash support for
multiple blocks of flash") from the arm tree and commit
0b1ea7e6450b3cc2e87d1c7295439483d007bb6e ("mtd: struct device - replace
bus_id with dev_name(), dev_set_name()") from the driver-core tree.

I fixed it up (see below).  Maybe you, Russell and David Woodhouse could
sort out who should coordinate these updates.

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

diff --cc drivers/mtd/maps/integrator-flash.c
index 5a773a3,d2ec262..0000000
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@@ -112,112 -121,7 +112,112 @@@ static int armflash_subdev_probe(struc
  		goto no_device;
  	}
  
 -	info->mtd->owner = THIS_MODULE;
 +	subdev->mtd->owner = THIS_MODULE;
 +
 +	/* Successful? */
 +	if (err == 0)
 +		return err;
 +
 +	if (subdev->mtd)
 +		map_destroy(subdev->mtd);
 + no_device:
 +	iounmap(base);
 + no_mem:
 +	release_mem_region(res->start, size);
 + out:
 +	return err;
 +}
 +
 +static void armflash_subdev_remove(struct armflash_subdev_info *subdev)
 +{
 +	if (subdev->mtd)
 +		map_destroy(subdev->mtd);
 +	if (subdev->map.virt)
 +		iounmap(subdev->map.virt);
 +	release_mem_region(subdev->map.phys, subdev->map.size);
 +}
 +
 +static int armflash_probe(struct platform_device *dev)
 +{
 +	struct flash_platform_data *plat = dev->dev.platform_data;
 +	unsigned int size;
 +	struct armflash_info *info;
 +	int i, nr, err;
 +
 +	/* Count the number of devices */
 +	for (nr = 0; ; nr++)
 +		if (!platform_get_resource(dev, IORESOURCE_MEM, nr))
 +			break;
 +	if (nr == 0) {
 +		err = -ENODEV;
 +		goto out;
 +	}
 +
 +	size = sizeof(struct armflash_info) +
 +		sizeof(struct armflash_subdev_info) * nr;
 +	info = kzalloc(size, GFP_KERNEL);
 +	if (!info) {
 +		err = -ENOMEM;
 +		goto out;
 +	}
 +
 +	if (plat && plat->init) {
 +		err = plat->init();
 +		if (err)
 +			goto no_resource;
 +	}
 +
 +	for (i = 0; i < nr; i++) {
 +		struct armflash_subdev_info *subdev = &info->subdev[i];
 +		struct resource *res;
 +
 +		res = platform_get_resource(dev, IORESOURCE_MEM, i);
 +		if (!res)
 +			break;
 +
 +		if (nr == 1)
 +			/* No MTD concatenation, just use the default name */
 +			snprintf(subdev->name, SUBDEV_NAME_SIZE, "%s",
- 				 dev->dev.bus_id);
++				 dev_name(&dev->dev));
 +		else
 +			snprintf(subdev->name, SUBDEV_NAME_SIZE, "%s-%d",
- 				 dev->dev.bus_id, i);
++				 dev_name(&dev->dev), i);
 +		subdev->plat = plat;
 +
 +		err = armflash_subdev_probe(subdev, res);
 +		if (err)
 +			break;
 +	}
 +	info->nr_subdev = i;
 +
 +	if (err)
 +		goto subdev_err;
 +
 +	if (info->nr_subdev == 1)
 +		info->mtd = info->subdev[0].mtd;
 +	else if (info->nr_subdev > 1) {
 +#ifdef CONFIG_MTD_CONCAT
 +		struct mtd_info *cdev[info->nr_subdev];
 +
 +		/*
 +		 * We detected multiple devices.  Concatenate them together.
 +		 */
 +		for (i = 0; i < info->nr_subdev; i++)
 +			cdev[i] = info->subdev[i].mtd;
 +
 +		info->mtd = mtd_concat_create(cdev, info->nr_subdev,
- 					      dev->dev.bus_id);
++					      dev_name(&dev->dev));
 +		if (info->mtd == NULL)
 +			err = -ENXIO;
 +#else
 +		printk(KERN_ERR "armflash: multiple devices found but "
 +		       "MTD concat support disabled.\n");
 +		err = -ENXIO;
 +#endif
 +	}
 +
 +	if (err < 0)
 +		goto cleanup;
  
  	err = parse_mtd_partitions(info->mtd, probes, &info->parts, 0);
  	if (err > 0) {

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

[Greg KH]

On Tue, Oct 14, 2008 at 01:50:18PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/x86/kernel/traps.c, arch/x86/kernel/traps_32.c and
> arch/x86/kernel/traps_64.c between various commits from Linus' tree and
> commit 9f3c643d0d55424a469a28d463a2ae74a16ba721 ("sysfs: crash
> debugging") from the driver-core tree.
> 
> The two traps_{64,32}.c files have been merged into the traps.c file but
> the code modified by the driver-core patch has been moved to dumpstack_
> {64,32}.c anyway.
> 
> I applied the following patch.
> 
> Time to update.

Yes, I need to resync, thanks for this, and the other patches.

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/s390/net/claw.c between commit
b9d3aed7e1e50183085fcd2af643bf42d6b4bd95 ("[S390] more bus_id -> dev_name
conversions") from Linus' tree and commit
9ea9c3769253947978746fab5cab5df10bc1ee35 ("Driver core: Use
dev_get_drvdata() accessors") from the driver-core tree.

I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/s390/net/claw.c
index 8f83fc9,328a521..0000000
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@@ -581,10 -581,10 +581,10 @@@ claw_irq_handler(struct ccw_device *cde
  
  	CLAW_DBF_TEXT(4, trace, "clawirq");
          /* Bypass all 'unsolicited interrupts' */
- 	if (!cdev->dev.driver_data) {
+ 	if (!dev_get_drvdata(&cdev->dev)) {
                  printk(KERN_WARNING "claw: unsolicited interrupt for device:"
  		 	"%s received c-%02x d-%02x\n",
 -		       cdev->dev.bus_id, irb->scsw.cmd.cstat,
 +		       dev_name(&cdev->dev), irb->scsw.cmd.cstat,
  		       irb->scsw.cmd.dstat);
  		CLAW_DBF_TEXT(2, trace, "badirq");
                  return;
@@@ -2880,10 -2879,9 +2880,10 @@@ claw_new_device(struct ccwgroup_device 
  	int ret;
  	struct ccw_dev_id dev_id;
  
 -	printk(KERN_INFO "claw: add for %s\n",cgdev->cdev[READ]->dev.bus_id);
 +	printk(KERN_INFO "claw: add for %s\n",
 +	       dev_name(&cgdev->cdev[READ]->dev));
  	CLAW_DBF_TEXT(2, setup, "new_dev");
- 	privptr = cgdev->dev.driver_data;
+ 	privptr = dev_get_drvdata(&cgdev->dev);
  	cgdev->cdev[READ]->dev.driver_data = privptr;
  	cgdev->cdev[WRITE]->dev.driver_data = privptr;
  	if (!privptr)
@@@ -2990,8 -2986,8 +2990,8 @@@ claw_shutdown_device(struct ccwgroup_de
  	struct net_device *ndev;
  	int	ret;
  
 -	CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id);
 +	CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
- 	priv = cgdev->dev.driver_data;
+ 	priv = dev_get_drvdata(&cgdev->dev);
  	if (!priv)
  		return -ENODEV;
  	ndev = priv->channel[READ].ndev;
@@@ -3020,11 -3016,11 +3020,11 @@@ claw_remove_device(struct ccwgroup_devi
  	struct claw_privbk *priv;
  
  	BUG_ON(!cgdev);
 -	CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id);
 +	CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
- 	priv = cgdev->dev.driver_data;
+ 	priv = dev_get_drvdata(&cgdev->dev);
  	BUG_ON(!priv);
  	printk(KERN_INFO "claw: %s() called %s will be removed.\n",
 -			__func__,cgdev->cdev[0]->dev.bus_id);
 +			__func__, dev_name(&cgdev->cdev[0]->dev));
  	if (cgdev->state == CCWGROUP_ONLINE)
  		claw_shutdown_device(cgdev);
  	claw_remove_files(&cgdev->dev);

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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/s390/char/vmlogrdr.c between commit
2a0217d5c7d22d6dd28f8ae5d20b06d24dc426b8 ("[S390] bus_id -> dev_name
conversions") from Linus' tree and commit
1ad49a066d3a1627b7a640117804a1058fc55aa0 ("device create: s390: convert
device_create_drvdata to device_create") from the driver-core tree.

I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/s390/char/vmlogrdr.c
index 42173cc,9775acb..0000000
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@@ -747,10 -748,10 +747,10 @@@ static int vmlogrdr_register_device(str
  		device_unregister(dev);
  		return ret;
  	}
- 	priv->class_device = device_create_drvdata(vmlogrdr_class, dev,
- 						   MKDEV(vmlogrdr_major,
- 							 priv->minor_num),
- 						   priv, "%s", dev_name(dev));
+ 	priv->class_device = device_create(vmlogrdr_class, dev,
+ 					   MKDEV(vmlogrdr_major,
+ 						 priv->minor_num),
 -					   priv, "%s", dev->bus_id);
++					   priv, "%s", dev_name(dev));
  	if (IS_ERR(priv->class_device)) {
  		ret = PTR_ERR(priv->class_device);
  		priv->class_device=NULL;

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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/s390/char/raw3270.c between commit
b9d3aed7e1e50183085fcd2af643bf42d6b4bd95 ("[S390] more bus_id -> dev_name
conversions") from Linus' tree and commit
1ad49a066d3a1627b7a640117804a1058fc55aa0 ("device create: s390: convert
device_create_drvdata to device_create") from the driver-core tree.

I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/s390/char/raw3270.c
index 1792b2c,abe17d4..0000000
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@@ -1168,19 -1168,17 +1168,17 @@@ static int raw3270_create_attributes(st
  	if (rc)
  		goto out;
  
- 	rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,
- 					     MKDEV(IBM_TTY3270_MAJOR, rp->minor),
- 					     NULL,
- 					     "tty%s", dev_name(&rp->cdev->dev));
+ 	rp->clttydev = device_create(class3270, &rp->cdev->dev,
+ 				     MKDEV(IBM_TTY3270_MAJOR, rp->minor), NULL,
 -				     "tty%s", rp->cdev->dev.bus_id);
++				     "tty%s", dev_name(&rp->cdev->dev));
  	if (IS_ERR(rp->clttydev)) {
  		rc = PTR_ERR(rp->clttydev);
  		goto out_ttydev;
  	}
  
- 	rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,
- 					     MKDEV(IBM_FS3270_MAJOR, rp->minor),
- 					     NULL,
- 					     "tub%s", dev_name(&rp->cdev->dev));
+ 	rp->cltubdev = device_create(class3270, &rp->cdev->dev,
+ 				     MKDEV(IBM_FS3270_MAJOR, rp->minor), NULL,
 -				     "tub%s", rp->cdev->dev.bus_id);
++				     "tub%s", dev_name(&rp->cdev->dev));
  	if (!IS_ERR(rp->cltubdev))
  		goto out;
  

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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
4b7679a561e552eeda1e3567119bef2bca99b66e ("mac80211: clean up rate
control API") from Linus' tree and commit
9ea9c3769253947978746fab5cab5df10bc1ee35 ("Driver core: Use
dev_get_drvdata() accessors") from the driver-core tree.

The latter just modifies code that the former removes (the show_rs_window
function).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/x86/kernel/traps.c, arch/x86/kernel/traps_32.c and
arch/x86/kernel/traps_64.c between various commits from Linus' tree and
commit 9f3c643d0d55424a469a28d463a2ae74a16ba721 ("sysfs: crash
debugging") from the driver-core tree.

The two traps_{64,32}.c files have been merged into the traps.c file but
the code modified by the driver-core patch has been moved to dumpstack_
{64,32}.c anyway.

I applied the following patch.

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

diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index 201ee35..1a78180 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
@@ -13,6 +13,7 @@
 #include <linux/kexec.h>
 #include <linux/bug.h>
 #include <linux/nmi.h>
+#include <linux/sysfs.h>
 
 #include <asm/stacktrace.h>
 
@@ -343,6 +344,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
 	printk("DEBUG_PAGEALLOC");
 #endif
 	printk("\n");
+	sysfs_printk_last_file();
 	if (notify_die(DIE_OOPS, str, regs, err,
 			current->thread.trap_no, SIGSEGV) == NOTIFY_STOP)
 		return 1;
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 086cc81..96a5db7 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -13,6 +13,7 @@
 #include <linux/kexec.h>
 #include <linux/bug.h>
 #include <linux/nmi.h>
+#include <linux/sysfs.h>
 
 #include <asm/stacktrace.h>
 
@@ -489,6 +490,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
 	printk("DEBUG_PAGEALLOC");
 #endif
 	printk("\n");
+	sysfs_printk_last_file();
 	if (notify_die(DIE_OOPS, str, regs, err,
 			current->thread.trap_no, SIGSEGV) == NOTIFY_STOP)
 		return 1;

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

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

[Greg KH]

On Tue, Jul 22, 2008 at 10:56:40AM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/usb/core/devio.c between commit
> e04199b2167e88f0e2d0410fafaa2c35ff7ba8c1 ("usbfs: don't store bad
> pointers in registration") from Linus' tree and commits
> 56d207f2504091e7a173640b91cb39072a2f4542 ("device create: usb: convert
> device_create to device_create_drvdata")
> 0de4509ad6495261fba5ebb539ac6fbb5cf66999 ("device create: usb: convert
> device_create_drvdata to device_create") from the driver-core tree.
> 
> I did the (reasonably obvious) fixup in usb_classdev_add.  Probably worth
> a check when I publish the tree.

If the code builds properly, the merge succeeded :)

I'll look at this as I hit this myself when pushing the USB tree to
Linus.  Now it's down to the driver-core tree having to handle these
fixups...

thanks,

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/usb/core/devio.c between commit
e04199b2167e88f0e2d0410fafaa2c35ff7ba8c1 ("usbfs: don't store bad
pointers in registration") from Linus' tree and commits
56d207f2504091e7a173640b91cb39072a2f4542 ("device create: usb: convert
device_create to device_create_drvdata")
0de4509ad6495261fba5ebb539ac6fbb5cf66999 ("device create: usb: convert
device_create_drvdata to device_create") from the driver-core tree.

I did the (reasonably obvious) fixup in usb_classdev_add.  Probably worth
a check when I publish the 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 --]

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/s390/cio/qdio.c between commit
779e6e1c724d30e0fd1baca78b852e41e3a23c1d ("[S390] qdio: new qdio
driver.") from Linus' tree and commit
00bcc6c6a1b34a65803e997a142470531b0b4213 ("s390: bus_id -> dev_name
conversions") from the driver-core tree.

The former commit split the file into a set of other files (and removed
the original). I am guessing that there may be now some more dev_name
updates to be done.

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

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