Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus-20160311' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"Late MTD fix for v4.5:
- A simple error code handling fix for the NAND ECC test; this was a
regression in v4.5-rc1
- A MAINTAINERS update, which might as well go in ASAP"
* tag 'for-linus-20160311' of git://git.infradead.org/linux-mtd:
MAINTAINERS: add a maintainer for the NAND subsystem
mtd: nand: tests: fix regression introduced in mtd_nandectest
+12
-1
+11
MAINTAINERS
+11
MAINTAINERS
···
7399
7399
S: Supported
7400
7400
F: drivers/net/ethernet/myricom/myri10ge/
7401
7401
7402
+
NAND FLASH SUBSYSTEM
7403
+
M: Boris Brezillon <boris.brezillon@free-electrons.com>
7404
+
R: Richard Weinberger <richard@nod.at>
7405
+
L: linux-mtd@lists.infradead.org
7406
+
W: http://www.linux-mtd.infradead.org/
7407
+
Q: http://patchwork.ozlabs.org/project/linux-mtd/list/
7408
+
T: git git://github.com/linux-nand/linux.git
7409
+
S: Maintained
7410
+
F: drivers/mtd/nand/
7411
+
F: include/linux/mtd/nand*.h
7412
+
7402
7413
NATSEMI ETHERNET DRIVER (DP8381x)
7403
7414
S: Orphan
7404
7415
F: drivers/net/ethernet/natsemi/natsemi.c
+1
-1
drivers/mtd/tests/mtd_nandecctest.c
+1
-1
drivers/mtd/tests/mtd_nandecctest.c
···
187
187
__nand_calculate_ecc(error_data, size, calc_ecc);
188
188
ret = __nand_correct_data(error_data, error_ecc, calc_ecc, size);
189
189
190
-
return (ret == -1) ? 0 : -EINVAL;
190
+
return (ret == -EBADMSG) ? 0 : -EINVAL;
191
191
}
192
192
193
193
static const struct nand_ecc_test nand_ecc_test[] = {