linux-kernel - 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-next>] [day] [month] [year] [list]

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

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@...nel.org>
 +L:	linux-kernel@...r.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/memory-controllers/
 +F:	drivers/memory/
 +
+ MEMORY FREQUENCY SCALING DRIVERS FOR NVIDIA TEGRA
+ M:	Dmitry Osipenko <digetx@...il.com>
+ L:	linux-pm@...r.kernel.org
+ L:	linux-tegra@...r.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@...ux-foundation.org>
  L:	linux-mm@...ck.org

Content of type "application/pgp-signature" skipped