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

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the staging tree with the l2-mtd tree
Date	Sun, 01 Nov 2015 14:40:01 +0100
Message-ID	<qq11v-sb-13@gated-at.bofh.it> (permalink)
X-Original-To	Greg KH <greg@kroah.com>, Brian Norris <computersforpeace@gmail.com>
X-Mailer	Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu)
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	48
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Boris BREZILLON <boris.brezillon@free-electrons.com>, Eva Rachel Retuya <eraretuya@gmail.com>
X-Original-Date	Mon, 2 Nov 2015 00:35:53 +1100
X-Original-Message-ID	<20151102003553.75b8236d@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1260159

Show key headers only | View raw

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;
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the staging tree with the l2-mtd tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-01 14:40 +0100

csiph-web