linux-next: manual merge of the pcmcia tree with the mtd tree

linux-next: manual merge of the pcmcia tree with the mtd tree

[Stephen Rothwell]

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

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/mtd/maps/pcmciamtd.c between commit
5da6bbe2f9e1db56b4a94cad2ace7d9992b1d666 ("pcmcia: convert pcmciamtd
driver to use new CIS helpers") from the mtd tree and commit
18b61b97294dad74dd00a1aa8efed0cfacb95aff ("pcmcia: convert pcmciamtd
driver to use new CIS helpers") from the pcmcia tree.

Presumably two different versions of the same change?  I just used the
version from the pcmcia tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the pcmcia tree with the mtd tree

[Dominik Brodowski]

Hi David,

could you drop it from your tree, please? It depends on a patch which is in
the PCMCIA tree, and so it isn't a good idea to carry this patch in the
linux-mtd tree (well, it doesn't matter all that much as this driver is
marked BROKEN anyways, but...)

Best,
	Dominik

linux-next: manual merge of the pcmcia tree with the mtd tree

[Stephen Rothwell]

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/mtd/maps/pcmciamtd.c between commit
9bdde162ebcc0237e722e8c3d0d376e35188a98f ("pcmciamtd: coding style
cleanups") from the mtd tree and commit
317b6d63000b3cc48c43d582d76063500e531a6c ("pcmcia: dev_node removal
(write-only drivers)") from the pcmcia tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mtd/maps/pcmciamtd.c
index c4aacbf,87b2b8f..0000000
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@@ -656,12 -646,11 +655,10 @@@ static int pcmciamtd_config(struct pcmc
  		pcmciamtd_release(link);
  		return -ENODEV;
  	}
- 	snprintf(dev->node.dev_name, sizeof(dev->node.dev_name), "mtd%d", mtd->index);
 -	info("mtd%d: %s", mtd->index, mtd->name);
 +	dev_info(&dev->p_dev->dev, "mtd%d: %s\n", mtd->index, mtd->name);
- 	link->dev_node = &dev->node;
  	return 0;
  
 - failed:
 -	err("CS Error, exiting");
 +	dev_err(&dev->p_dev->dev, "CS Error, exiting\n");
  	pcmciamtd_release(link);
  	return -ENODEV;
  }