Re: linux-next: manual merge of the gpio-brgl tree with the net-next tree

Hi all, On Tue, 16 Feb 2021 18:19:38 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the gpio-brgl tree got a conflict in: > > MAINTAINERS > > between commit: > > df53e4f48e8d ("MAINTAINERS: Add entries for Toshiba Visconti ethernet > controller") > > from the net-next tr

linux-next: manual merge of the gpio-brgl tree with the net-next tree

Hi all, Today's linux-next merge of the gpio-brgl tree got a conflict in: MAINTAINERS between commit: df53e4f48e8d ("MAINTAINERS: Add entries for Toshiba Visconti ethernet controller") from the net-next tree and commit: 5103c90d133c ("MAINTAINERS: Add entries for Toshiba Visconti GPIO