linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for Oct 1
@ 2013-10-01 11:03 Thierry Reding
  2013-10-01 11:07 ` linux-next: manual merge of the bcon tree Thierry Reding
                   ` (7 more replies)
  0 siblings, 8 replies; 38+ messages in thread
From: Thierry Reding @ 2013-10-01 11:03 UTC (permalink / raw)
  To: linux-next, linux-kernel; +Cc: Mark Brown

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

Hi all,

I've uploaded today's linux-next tree to the master branch of the
repository below:

	git://gitorious.org/thierryreding/linux-next.git

A next-20131001 tag is also provided for convenience.

The situation is pretty much the same as yesterday. Some conflicts went
away, but most remained. i386 and x86_64 default configuration builds
show no breakage and ARM default configurations are still being built.
Yesterday's run didn't show any merge-related breakage. I found a single
build issue for i.MX which was trivial to fix and sent out a patch.

I received a response from a few people to the conflict notifications,
so I won't be sending those out again. For those that I haven't received
any replies and for new conflicts, new notifications will be sent
shortly.

It looks as if I will be able to do another linux-next tree tomorrow,
but not on Thursday and Friday, so Mark Brown will be doing those. If
anyone else is interested in helping out you're very welcome.

Thierry

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

^ permalink raw reply	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-12-03 23:44 Stephen Rothwell
  2008-12-04  4:21 ` Greg KH
  0 siblings, 1 reply; 38+ messages in thread
From: Stephen Rothwell @ 2008-12-03 23:44 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, Kay Sievers, Kumar Gala, Paul Mackerras,
	Benjamin Herrenschmidt, linuxppc-dev

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);

^ permalink raw reply	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-12-01  0:15 Stephen Rothwell
  2008-12-01  9:23 ` Russell King
  2008-12-01 17:32 ` Catalin Marinas
  0 siblings, 2 replies; 38+ messages in thread
From: Stephen Rothwell @ 2008-12-01  0:15 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, Catalin Marinas, Russell King, Kay Sievers, David Woodhouse

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) {

^ permalink raw reply	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-10-14  3:09 Stephen Rothwell
  0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2008-10-14  3:09 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Hannes Reinecke, Cornelia Huck

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

^ permalink raw reply	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-10-14  3:05 Stephen Rothwell
  0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2008-10-14  3:05 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Kay Sievers

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

^ permalink raw reply	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-10-14  3:02 Stephen Rothwell
  0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2008-10-14  3:02 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Cornelia Huck

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

^ permalink raw reply	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-10-14  2:57 Stephen Rothwell
  0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2008-10-14  2:57 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Johannes Berg, Hannes Reinecke

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

^ permalink raw reply	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-10-14  2:50 Stephen Rothwell
  2008-10-14  3:51 ` Greg KH
  0 siblings, 1 reply; 38+ messages in thread
From: Stephen Rothwell @ 2008-10-14  2:50 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Andrew Morton

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

^ permalink raw reply related	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-07-23  1:31 Stephen Rothwell
  2008-07-23  4:21 ` Greg KH
  2008-07-23  8:09 ` Stephen Rothwell
  0 siblings, 2 replies; 38+ messages in thread
From: Stephen Rothwell @ 2008-07-23  1:31 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Alan Cox, David Howells

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

^ permalink raw reply	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-07-22  0:56 Stephen Rothwell
  2008-07-22  3:14 ` Greg KH
  0 siblings, 1 reply; 38+ messages in thread
From: Stephen Rothwell @ 2008-07-22  0:56 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Alan Stern

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

^ permalink raw reply	[flat|nested] 38+ messages in thread
* linux-next: manual merge of the driver-core tree
@ 2008-07-18  1:02 Stephen Rothwell
  0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2008-07-18  1:02 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Kay Sievers, Jan Glauber

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

^ permalink raw reply	[flat|nested] 38+ messages in thread

end of thread, other threads:[~2013-10-01 15:45 UTC | newest]

Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the bcon tree Thierry Reding
2013-10-01 14:26   ` Jörn Engel
2013-10-01 11:07 ` linux-next: manual merge of the block tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the cgroup tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the driver-core tree Thierry Reding
2013-10-01 13:54   ` Greg Kroah-Hartman
2013-10-01 11:07 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the random tree Thierry Reding
2013-10-01 11:29   ` Theodore Ts'o
2013-10-01 11:07 ` linux-next: manual merge of the sh tree Thierry Reding
2013-10-01 13:53   ` Greg Kroah-Hartman
2013-10-01 11:07 ` linux-next: manual merge of the vfs tree Thierry Reding
  -- strict thread matches above, loose matches on Subject: below --
2008-12-03 23:44 linux-next: manual merge of the driver-core tree Stephen Rothwell
2008-12-04  4:21 ` Greg KH
2008-12-04 10:42   ` Paul Mackerras
2008-12-04 18:00     ` Greg KH
2009-01-04 23:28   ` Stephen Rothwell
2009-01-05  4:36     ` Greg KH
2009-01-05  5:57       ` Stephen Rothwell
2008-12-01  0:15 Stephen Rothwell
2008-12-01  9:23 ` Russell King
2008-12-01 11:17   ` Catalin Marinas
2008-12-01 17:32 ` Catalin Marinas
2008-12-01 23:31   ` Stephen Rothwell
2008-10-14  3:09 Stephen Rothwell
2008-10-14  3:05 Stephen Rothwell
2008-10-14  3:02 Stephen Rothwell
2008-10-14  2:57 Stephen Rothwell
2008-10-14  2:50 Stephen Rothwell
2008-10-14  3:51 ` Greg KH
2008-07-23  1:31 Stephen Rothwell
2008-07-23  4:21 ` Greg KH
2008-07-23  8:09 ` Stephen Rothwell
2008-07-23 14:04   ` Greg KH
2008-07-22  0:56 Stephen Rothwell
2008-07-22  3:14 ` Greg KH
2008-07-18  1:02 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).