# linux-next: manual merge of the char-misc tree with the powerpc tree - List: linuxppc-dev - 3 messages, 2 authors - Page: https://ratatoskr.run/linuxppc-dev/2020/10/6131737/t ## linux-next: manual merge of the char-misc tree with the powerpc tree - From: Stephen Rothwell \ - Date: 2020-10-06 07:35:12 - Message: https://ratatoskr.run/linuxppc-dev/2020/10/6131737.md ```text 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 ``` ## Re: linux-next: manual merge of the char-misc tree with the powerpc tree - From: Greg KH \ - Date: 2020-10-06 08:31:16 - Message: https://ratatoskr.run/linuxppc-dev/2020/10/6131786.md ```text 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 ``` ## Re: linux-next: manual merge of the char-misc tree with the powerpc tree - From: Stephen Rothwell \ - Date: 2020-10-15 23:12:31 - Message: https://ratatoskr.run/linuxppc-dev/2020/10/6141191.md ```text Hi all, On Tue, 6 Oct 2020 18:35:06 +1100 Stephen Rothwell [ref] 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 ```