lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the devfreq tree with the arm-soc tree
On Mon, 27 Jul 2020 at 12:16, Stephen Rothwell <sfr@canb.auug.org.au> 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

\
 
 \ /
  Last update: 2020-07-27 12:20    [W:0.061 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site