On Mon, 27 Jul 2020 at 12:16, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 and commit:
>
> 34886407581b ("PM / devfreq: tegra: Add Dmitry as a maintainer")
Thanks, looks correct to me,
Dear Arnd, Olof,
I forgot to check for this conflic. I don't expect any other conflicts
in the first drivers/memory pull.
Best regards,
Krzysztof
