linux-next: manual merge of the staging tree with the at91 tree

[Stephen Rothwell]

Hi all,

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

  MAINTAINERS

between commit:

  5ae2f1f30197 ("MAINTAINERS: move former ATMEL entries to proper MICROCHIP locatioat91n")

from the at91 tree and commit:

  010de20412fc ("MAINTAINERS: Add entry for mcp3911 ADC driver")

from the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 0d01245ef7b4,7f77f2c837a8..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9539,72 -9582,14 +9554,80 @@@ L:	netdev@xxxxxxxxxxxxxx
  S:	Maintained
  F:	drivers/net/ethernet/microchip/lan743x_*
  
 +MICROCHIP LCDFB DRIVER
 +M:	Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
 +L:	linux-fbdev@xxxxxxxxxxxxxxx
 +S:	Maintained
 +F:	drivers/video/fbdev/atmel_lcdfb.c
 +F:	include/video/atmel_lcdc.h
 +
+ MICROCHIP / ATMEL MCP3911 ADC DRIVER
+ M:	Marcus Folkesson <marcus.folkesson@xxxxxxxxx>
+ M:	Kent Gustavsson <kent@xxxxxxxxxx>
+ L:	linux-iio@xxxxxxxxxxxxxxx
+ S:	Supported
+ F:	drivers/iio/adc/mcp3911.c
+ F:	Documentation/devicetree/bindings/iio/adc/mcp3911.txt
+ 
 +MICROCHIP MMC/SD/SDIO MCI DRIVER
 +M:	Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx>
 +S:	Maintained
 +F:	drivers/mmc/host/atmel-mci.c
 +
 +MICROCHIP NAND DRIVER
 +M:	Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx>
 +L:	linux-mtd@xxxxxxxxxxxxxxxxxxx
 +S:	Supported
 +F:	drivers/mtd/nand/raw/atmel/*
 +F:	Documentation/devicetree/bindings/mtd/atmel-nand.txt
 +
 +MICROCHIP PWM DRIVER
 +M:	Claudiu Beznea <claudiu.beznea@xxxxxxxxxxxxx>
 +L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
 +L:	linux-pwm@xxxxxxxxxxxxxxx
 +S:	Supported
 +F:	drivers/pwm/pwm-atmel.c
 +F:	Documentation/devicetree/bindings/pwm/atmel-pwm.txt
 +
 +MICROCHIP SAMA5D2-COMPATIBLE ADC DRIVER
 +M:	Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx>
 +M:	Eugen Hristev <eugen.hristev@xxxxxxxxxxxxx>
 +L:	linux-iio@xxxxxxxxxxxxxxx
 +S:	Supported
 +F:	drivers/iio/adc/at91-sama5d2_adc.c
 +F:	Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt
 +F:	include/dt-bindings/iio/adc/at91-sama5d2_adc.h
 +
 +MICROCHIP SAMA5D2-COMPATIBLE SHUTDOWN CONTROLLER
 +M:	Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
 +S:	Supported
 +F:	drivers/power/reset/at91-sama5d2_shdwc.c
 +
 +MICROCHIP SPI DRIVER
 +M:	Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
 +S:	Supported
 +F:	drivers/spi/spi-atmel.*
 +
 +MICROCHIP SSC DRIVER
 +M:	Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
 +L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
 +S:	Supported
 +F:	drivers/misc/atmel-ssc.c
 +F:	include/linux/atmel-ssc.h
 +
 +MICROCHIP TIMER COUNTER (TC) AND CLOCKSOURCE DRIVERS
 +M:	Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
 +L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
 +S:	Supported
 +F:	drivers/misc/atmel_tclib.c
 +F:	drivers/clocksource/tcb_clksrc.c
 +
 +MICROCHIP USBA UDC DRIVER
 +M:	Cristian Birsan <cristian.birsan@xxxxxxxxxxxxx>
 +L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
 +S:	Supported
 +F:	drivers/usb/gadget/udc/atmel_usba_udc.*
 +
  MICROCHIP USB251XB DRIVER
  M:	Richard Leitner <richard.leitner@xxxxxxxxxxx>
  L:	linux-usb@xxxxxxxxxxxxxxx

Attachment: pgprMPJTsso7c.pgp
Description: OpenPGP digital signature