Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the devfreq tree with the arm-soc tree
@ 2020-07-27 10:16 Stephen Rothwell
  2020-07-27 10:20 ` Krzysztof Kozlowski
  2020-07-31  4:00 ` Stephen Rothwell
  0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-07-27 10:16 UTC (permalink / raw)
  To: Chanwoo Choi, Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Krzysztof Kozlowski, Dmitry Osipenko


[-- Attachment #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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the devfreq tree with the arm-soc tree
  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
  2020-07-31  4:00 ` Stephen Rothwell
  1 sibling, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2020-07-27 10:20 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Chanwoo Choi, Olof Johansson, Arnd Bergmann, ARM,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Dmitry Osipenko

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the devfreq tree with the arm-soc tree
  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
@ 2020-07-31  4:00 ` Stephen Rothwell
  1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-07-31  4:00 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, Rafael J. Wysocki
  Cc: Chanwoo Choi, ARM, Linux Next Mailing List,
	Linux Kernel Mailing List, Krzysztof Kozlowski, Dmitry Osipenko


[-- Attachment #1: Type: text/plain, Size: 1878 bytes --]

Hi all,

On Mon, 27 Jul 2020 20:16:00 +1000 Stephen Rothwell <sfr@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@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


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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2020-07-31  4:00 ` Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git