Re: linux-next: manual merge of the char-misc tree with the powerpc tree

Hi all, On Tue, 6 Oct 2020 18:35:06 +1100 Stephen Rothwell 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

Re: linux-next: manual merge of the char-misc tree with the powerpc tree

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

linux-next: manual merge of the char-misc tree with the powerpc tree

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

Re: linux-next: manual merge of the char-misc tree with the powerpc tree

Hi all, On Mon, 3 Aug 2020 16:55:46 +1000 Stephen Rothwell 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

linux-next: manual merge of the char-misc tree with the powerpc tree

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