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

From: Stephen Rothwell
Date: Mon Nov 30 2009 - 20:37:50 EST

Next message: Joe Jin: "[patch] qla2xxx: use F/W calculated residual length."
Previous message: helight: "Re: Subject: [PATCH 2/2] fix a Section mismatch in arch/x86/pci/mmconfig-shared.cand include/linux/sfi_acpi.h"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi David,

Today's linux-next merge of the mtd tree got a conflict in drivers/mtd/nand/pxa3xx_nand.c between commit f923cfbd298a3c5d05fe20712765ed73387b4b3c ("pxa3xx_nand: fix memory out of bound") from the pxa tree and commit 98ecc914d0a48dbbcbb5fc866ab5b59a52afbd41 ("mtd: pxa3xx_nand: Fix PIO data transfer") from the mtd tree.

They seem to be doing the same thing but differently. I just kept the
version from the pxa tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Joe Jin: "[patch] qla2xxx: use F/W calculated residual length."
Previous message: helight: "Re: Subject: [PATCH 2/2] fix a Section mismatch in arch/x86/pci/mmconfig-shared.cand include/linux/sfi_acpi.h"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]