LinuxPPC-Dev Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the char-misc tree with the powerpc tree
@ 2020-10-06  7:35 Stephen Rothwell
  2020-10-06  8:21 ` Greg KH
  2020-10-15 23:12 ` Stephen Rothwell
  0 siblings, 2 replies; 7+ messages in thread
From: Stephen Rothwell @ 2020-10-06  7:35 UTC (permalink / raw)
  To: Greg KH, Arnd Bergmann, Michael Ellerman, PowerPC
  Cc: Frederic Barrat, Necip Fazil Yildiran, Linux Next Mailing List,
	Linux Kernel Mailing List


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

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/misc/ocxl/Kconfig

between commit:

  dde6f18a8779 ("ocxl: Don't return trigger page when allocating an interrupt")

from the powerpc tree and commit:

  4b53a3c72116 ("ocxl: fix kconfig dependency warning for OCXL")

from the char-misc 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 drivers/misc/ocxl/Kconfig
index 0d815b2a40b3,947294f6d7f4..000000000000
--- a/drivers/misc/ocxl/Kconfig
+++ b/drivers/misc/ocxl/Kconfig
@@@ -9,9 -9,8 +9,9 @@@ config OCXL_BAS
  
  config OCXL
  	tristate "OpenCAPI coherent accelerator support"
 -	depends on PPC_POWERNV && PCI && EEH && HOTPLUG_PCI_POWERNV
 +	depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE
++	depends on HOTPLUG_PCI_POWERNV
  	select OCXL_BASE
- 	select HOTPLUG_PCI_POWERNV
  	default m
  	help
  	  Select this option to enable the ocxl driver for Open

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

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

* Re: linux-next: manual merge of the char-misc tree with the powerpc tree
  2020-10-06  7:35 linux-next: manual merge of the char-misc tree with the powerpc tree Stephen Rothwell
@ 2020-10-06  8:21 ` Greg KH
  2020-10-15 23:12 ` Stephen Rothwell
  1 sibling, 0 replies; 7+ messages in thread
From: Greg KH @ 2020-10-06  8:21 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Arnd Bergmann, Necip Fazil Yildiran, Linux Kernel Mailing List,
	Linux Next Mailing List, Frederic Barrat, PowerPC

On Tue, Oct 06, 2020 at 06:35:06PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/misc/ocxl/Kconfig
> 
> between commit:
> 
>   dde6f18a8779 ("ocxl: Don't return trigger page when allocating an interrupt")
> 
> from the powerpc tree and commit:
> 
>   4b53a3c72116 ("ocxl: fix kconfig dependency warning for OCXL")
> 
> from the char-misc 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 drivers/misc/ocxl/Kconfig
> index 0d815b2a40b3,947294f6d7f4..000000000000
> --- a/drivers/misc/ocxl/Kconfig
> +++ b/drivers/misc/ocxl/Kconfig
> @@@ -9,9 -9,8 +9,9 @@@ config OCXL_BAS
>   
>   config OCXL
>   	tristate "OpenCAPI coherent accelerator support"
>  -	depends on PPC_POWERNV && PCI && EEH && HOTPLUG_PCI_POWERNV
>  +	depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE
> ++	depends on HOTPLUG_PCI_POWERNV
>   	select OCXL_BASE
> - 	select HOTPLUG_PCI_POWERNV
>   	default m
>   	help
>   	  Select this option to enable the ocxl driver for Open

Looks good, thanks!

greg k-h

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

* Re: linux-next: manual merge of the char-misc tree with the powerpc tree
  2020-10-06  7:35 linux-next: manual merge of the char-misc tree with the powerpc tree Stephen Rothwell
  2020-10-06  8:21 ` Greg KH
@ 2020-10-15 23:12 ` Stephen Rothwell
  1 sibling, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2020-10-15 23:12 UTC (permalink / raw)
  To: Michael Ellerman, PowerPC
  Cc: Arnd Bergmann, Greg KH, Necip Fazil Yildiran,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Frederic Barrat


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

Hi all,

On Tue, 6 Oct 2020 18:35:06 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/misc/ocxl/Kconfig
> 
> between commit:
> 
>   dde6f18a8779 ("ocxl: Don't return trigger page when allocating an interrupt")
> 
> from the powerpc tree and commit:
> 
>   4b53a3c72116 ("ocxl: fix kconfig dependency warning for OCXL")
> 
> from the char-misc 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 drivers/misc/ocxl/Kconfig
> index 0d815b2a40b3,947294f6d7f4..000000000000
> --- a/drivers/misc/ocxl/Kconfig
> +++ b/drivers/misc/ocxl/Kconfig
> @@@ -9,9 -9,8 +9,9 @@@ config OCXL_BAS
>   
>   config OCXL
>   	tristate "OpenCAPI coherent accelerator support"
>  -	depends on PPC_POWERNV && PCI && EEH && HOTPLUG_PCI_POWERNV
>  +	depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE
> ++	depends on HOTPLUG_PCI_POWERNV
>   	select OCXL_BASE
> - 	select HOTPLUG_PCI_POWERNV
>   	default m
>   	help
>   	  Select this option to enable the ocxl driver for Open

This is now a conflict between the powerpc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: manual merge of the char-misc tree with the powerpc tree
  2020-08-03  6:55 Stephen Rothwell
@ 2020-08-05 23:40 ` Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2020-08-05 23:40 UTC (permalink / raw)
  To: Greg KH, Arnd Bergmann, Michael Ellerman, PowerPC
  Cc: Linux Next Mailing List, Lee Jones, Linux Kernel Mailing List,
	Alastair D'Silva


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

Hi all,

On Mon, 3 Aug 2020 16:55:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/misc/ocxl/config.c
> 
> between commit:
> 
>   3591538a31af ("ocxl: Address kernel doc errors & warnings")
> 
> from the powerpc tree and commit:
> 
>   28fc491e9be6 ("misc: ocxl: config: Provide correct formatting to function headers")
> 
> from the char-misc tree.
> 
> I fixed it up (as it was just differences in comments, I just arbitrarily
> chose the latter version) 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.

This is now a conflict between the powerpc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: manual merge of the char-misc tree with the powerpc tree
@ 2020-08-03  6:55 Stephen Rothwell
  2020-08-05 23:40 ` Stephen Rothwell
  0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2020-08-03  6:55 UTC (permalink / raw)
  To: Greg KH, Arnd Bergmann, Michael Ellerman, PowerPC
  Cc: Linux Next Mailing List, Lee Jones, Linux Kernel Mailing List,
	Alastair D'Silva


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

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/misc/ocxl/config.c

between commit:

  3591538a31af ("ocxl: Address kernel doc errors & warnings")

from the powerpc tree and commit:

  28fc491e9be6 ("misc: ocxl: config: Provide correct formatting to function headers")

from the char-misc tree.

I fixed it up (as it was just differences in comments, I just arbitrarily
chose the latter version) 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

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

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

* Re: linux-next: manual merge of the char-misc tree with the powerpc tree
  2012-03-16  5:52 Stephen Rothwell
@ 2012-03-16 15:29 ` Greg KH
  0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2012-03-16 15:29 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Arnd Bergmann, linux-kernel, Masanari Iida, linux-next,
	Paul Mackerras, linuxppc-dev

On Fri, Mar 16, 2012 at 04:52:07PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some
> of the legacy iSeries specific device drivers") from the powerpc tree and
> commit 5fb15db4376f ("char: Fix typo in viotape.c") from the char-misc
> tree.
> 
> The former removed this file, so I did that.

Sounds good to me, thanks.

greg k-h

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

* linux-next: manual merge of the char-misc tree with the powerpc tree
@ 2012-03-16  5:52 Stephen Rothwell
  2012-03-16 15:29 ` Greg KH
  0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2012-03-16  5:52 UTC (permalink / raw)
  To: Greg KH, Arnd Bergmann
  Cc: linux-kernel, Masanari Iida, linux-next, Paul Mackerras, linuxppc-dev


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

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some
of the legacy iSeries specific device drivers") from the powerpc tree and
commit 5fb15db4376f ("char: Fix typo in viotape.c") from the char-misc
tree.

The former removed this file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

end of thread, back to index

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-06  7:35 linux-next: manual merge of the char-misc tree with the powerpc tree Stephen Rothwell
2020-10-06  8:21 ` Greg KH
2020-10-15 23:12 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-08-03  6:55 Stephen Rothwell
2020-08-05 23:40 ` Stephen Rothwell
2012-03-16  5:52 Stephen Rothwell
2012-03-16 15:29 ` Greg KH

LinuxPPC-Dev Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linuxppc-dev/0 linuxppc-dev/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 linuxppc-dev linuxppc-dev/ https://lore.kernel.org/linuxppc-dev \
		linuxppc-dev@lists.ozlabs.org linuxppc-dev@ozlabs.org
	public-inbox-index linuxppc-dev

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.ozlabs.lists.linuxppc-dev


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