Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
MAINTAINERS between commit d4b6c2755ce1 ("MAINTAINERS: Add Broadcom
BCM47xx entry") from the tree and commit b93598277db2 ("MAINTAINERS:
remove section BROADCOM BCM33XX MIPS ARCHITECTURE") from the
akpm-current tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc MAINTAINERS index 5f620640c34d,6de7364e67a4..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2211,22 -2153,6 +2211,14 @@@ T: git git://git.kernel.org/pub/scm/lin S: Maintained N: bcm2835 - BROADCOM BCM33XX MIPS ARCHITECTURE - M: Kevin Cernekee <[email protected]> - L: [email protected] - S: Maintained - F: arch/mips/bcm3384/* - F: arch/mips/include/asm/mach-bcm3384/* - F: arch/mips/kernel/*bmips* - +BROADCOM BCM47XX MIPS ARCHITECTURE +M: Hauke Mehrtens <[email protected]> +M: Rafał Miłecki <[email protected]> +L: [email protected] +S: Maintained +F: arch/mips/bcm47xx/* +F: arch/mips/include/asm/mach-bcm47xx/* + BROADCOM BCM5301X ARM ARCHITECTURE M: Hauke Mehrtens <[email protected]> L: [email protected] @@@ -2322,14 -2247,8 +2314,14 @@@ M: Ray Jui <[email protected] L: [email protected] S: Supported F: drivers/gpio/gpio-bcm-kona.c - F: Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt + F: Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt +BROADCOM STB NAND FLASH DRIVER +M: Brian Norris <[email protected]> +L: [email protected] +S: Maintained +F: drivers/mtd/nand/brcmnand/ + BROADCOM SPECIFIC AMBA DRIVER (BCMA) M: Rafał Miłecki <[email protected]> L: [email protected]
pgplXmyv2rzra.pgp
Description: OpenPGP digital signature
