linux-next: manual merge of the staging tree with the l2-mtd tree

linux-next: manual merge of the staging tree with the l2-mtd tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/spectra/lld_mtd.c between a series of commits from the
l2-mtd tree and commit be7f39c5ecf5 ("Staging: delete spectra driver")
from the staging tree.

I just removed the file.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Artem Bityutskiy]

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

On Wed, 2011-12-28 at 17:54 +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/spectra/lld_mtd.c between a series of commits from the
> l2-mtd tree and commit be7f39c5ecf5 ("Staging: delete spectra driver")
> from the staging tree.
> 
> I just removed the file.

Oh, it is in staging, I somehow missed that and pushed a small clean-up
to the MTD tree (because the driver is an MTD driver). I'll kill that
commit now.

Apologies for the hassle.

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

[Artem Bityutskiy]

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

On Wed, 2011-12-28 at 10:54 +0200, Artem Bityutskiy wrote:
> On Wed, 2011-12-28 at 17:54 +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/spectra/lld_mtd.c between a series of commits from the
> > l2-mtd tree and commit be7f39c5ecf5 ("Staging: delete spectra driver")
> > from the staging tree.
> > 
> > I just removed the file.
> 
> Oh, it is in staging, I somehow missed that and pushed a small clean-up
> to the MTD tree (because the driver is an MTD driver). I'll kill that
> commit now.
> 
> Apologies for the hassle.

Actually, I was thinking about a different commit. Anyway, thanks for
fixing this up - removing the file is fine.

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the staging tree with the l2-mtd tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/mt29f_spinand/mt29f_spinand.c

between commit:

  45aaeff94719 ("mtd: nand: pass page number to ecc->write_xxx() methods")

from the l2-mtd tree and commits:

  74f63bd664b6 ("Staging: mt29f_spinand: Use preferred kernel types")
  92fdd777976e ("Staging: mt29f_spinand: Indent to match open parenthesis")

from the staging tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/mt29f_spinand/mt29f_spinand.c
index b2e6237ae913,20a3f8eeb264..000000000000
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@@ -612,10 -612,10 +612,10 @@@ static int spinand_erase_block(struct s
  
  #ifdef CONFIG_MTD_SPINAND_ONDIEECC
  static int spinand_write_page_hwecc(struct mtd_info *mtd,
- 		struct nand_chip *chip, const uint8_t *buf, int oob_required,
- 		int page)
+ 				    struct nand_chip *chip,
 -				    const u8 *buf, int oob_required)
++				    const u8 *buf, int oob_required, int page)
  {
- 	const uint8_t *p = buf;
+ 	const u8 *p = buf;
  	int eccsize = chip->ecc.size;
  	int eccsteps = chip->ecc.steps;