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

[Stephen Rothwell]

Hi all,

On Mon, 27 Jul 2020 20:16:00 +1000 Stephen Rothwell <sfr at canb.auug.org.au> wrote:
>
> 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.
> 
> 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 at kernel.org>
>  +L:	linux-kernel at 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 at gmail.com>
> + L:	linux-pm at vger.kernel.org
> + L:	linux-tegra at 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 at linux-foundation.org>
>   L:	linux-mm at kvack.org


This is now a conflict between the pm and arm-soc trees.

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20200731/71129d2c/attachment-0001.sig>