From: Krzysztof Kozlowski <krzk@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chanwoo Choi <cw00.choi@samsung.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dmitry Osipenko <digetx@gmail.com>
Subject: Re: linux-next: manual merge of the devfreq tree with the arm-soc tree
Date: Mon, 27 Jul 2020 12:20:29 +0200 [thread overview]
Message-ID: <CAJKOXPcna2YyemERXhumasikQZMKVciQoDbpDfAYAvg3+GCXMQ@mail.gmail.com> (raw)
In-Reply-To: <20200727201600.7d3b31c8@canb.auug.org.au>
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
next prev parent reply other threads:[~2020-07-27 10:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 10:16 linux-next: manual merge of the devfreq tree with the arm-soc tree Stephen Rothwell
2020-07-27 10:20 ` Krzysztof Kozlowski [this message]
2020-07-31 4:00 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJKOXPcna2YyemERXhumasikQZMKVciQoDbpDfAYAvg3+GCXMQ@mail.gmail.com \
--to=krzk@kernel.org \
--cc=arnd@arndb.de \
--cc=cw00.choi@samsung.com \
--cc=digetx@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).