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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJKOXPcna2YyemERXhumasikQZMKVciQoDbpDfAYAvg3+GCXMQ@mail.gmail.com>
Date:   Mon, 27 Jul 2020 12:20:29 +0200
From:   Krzysztof Kozlowski <krzk@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Chanwoo Choi <cw00.choi@...sung.com>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Dmitry Osipenko <digetx@...il.com>
Subject: Re: linux-next: manual merge of the devfreq tree with the arm-soc tree

On Mon, 27 Jul 2020 at 12:16, Stephen Rothwell <sfr@...b.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