From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chanwoo Choi <cw00.choi@samsung.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Dmitry Osipenko <digetx@gmail.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>
Subject: linux-next: manual merge of the devfreq tree with the arm-soc tree
Date: Mon, 27 Jul 2020 20:16:00 +1000 [thread overview]
Message-ID: <20200727201600.7d3b31c8@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1634 bytes --]
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")
from the devfreq tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 2b1d2d3fbd4e,e2e95c877f0b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11202,13 -11086,15 +11202,22 @@@ F: Documentation/core-api/boot-time-mm.
F: include/linux/memblock.h
F: mm/memblock.c
+MEMORY CONTROLLER DRIVERS
+M: Krzysztof Kozlowski <krzk@kernel.org>
+L: linux-kernel@vger.kernel.org
+S: Maintained
+F: Documentation/devicetree/bindings/memory-controllers/
+F: drivers/memory/
+
+ MEMORY FREQUENCY SCALING DRIVERS FOR NVIDIA TEGRA
+ M: Dmitry Osipenko <digetx@gmail.com>
+ L: linux-pm@vger.kernel.org
+ L: linux-tegra@vger.kernel.org
+ T: git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
+ S: Maintained
+ F: drivers/devfreq/tegra20-devfreq.c
+ F: drivers/devfreq/tegra30-devfreq.c
+
MEMORY MANAGEMENT
M: Andrew Morton <akpm@linux-foundation.org>
L: linux-mm@kvack.org
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2020-07-27 10:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 10:16 Stephen Rothwell [this message]
2020-07-27 10:20 ` linux-next: manual merge of the devfreq tree with the arm-soc tree Krzysztof Kozlowski
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=20200727201600.7d3b31c8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=cw00.choi@samsung.com \
--cc=digetx@gmail.com \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
/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).