Re: linux-next: manual merge of the devfreq tree with the arm-soc tree

Hi all, On Mon, 27 Jul 2020 20:16:00 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the devfreq tree got a conflict in: > > MAINTAINERS > > between commit: > > 8a9ff8758159 ("MAINTAINERS: Add Krzysztof Kozlowski as maintainer of memory > controllers") > > from the arm-soc

Re: linux-next: manual merge of the devfreq tree with the arm-soc tree

On Mon, 27 Jul 2020 at 12:16, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the devfreq tree got a conflict in: > > MAINTAINERS > > between commit: > > 8a9ff8758159 ("MAINTAINERS: Add Krzysztof Kozlowski as maintainer of memory > controllers") > > from the arm-soc tree a