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

2018-09-18 Thread Greg KH
On Tue, Sep 18, 2018 at 01:12:38PM +1000, Stephen Rothwell wrote: > 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

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

2018-09-18 Thread Greg KH
On Tue, Sep 18, 2018 at 01:12:38PM +1000, Stephen Rothwell wrote: > 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

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

2018-09-18 Thread Nicolas Ferre
On 18/09/2018 at 05:12, Stephen Rothwell wrote: 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

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

2018-09-18 Thread Nicolas Ferre
On 18/09/2018 at 05:12, Stephen Rothwell wrote: 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

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

2018-09-17 Thread 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")

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

2018-09-17 Thread 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")