Re: linux-next: manual merge of the rockchip tree with the renesas tree

Thanks Stephen, On Wed, May 16, 2018 at 11:39:18AM +1000, Stephen Rothwell wrote: > Hi all, > > On Thu, 3 May 2018 08:36:54 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the rockchip tree got a conflict in: > > > > arch/arm64/configs/defconfig > > > > between commits:

Re: linux-next: manual merge of the rockchip tree with the renesas tree

Hi all, On Thu, 3 May 2018 08:36:54 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the rockchip tree got a conflict in: > > arch/arm64/configs/defconfig > > between commits: > > 93f7bfd930c0 ("arm64: defconfig: makes SND_SIMPLE_CARD to module") > ddf3fa8b8a16 ("arm64: def

Re: linux-next: manual merge of the rockchip tree with the renesas tree

[CC Arnd, Olof, Kevin, Linux-Renesas-SoC ML] Thanks Stephen, the resolution seems correct to me. Arnd, Olof, Kevin, how would you like to handle this? I'd be quite happy for the commits in my tree, the first two mentioned below to be merged elsewhere or deferred until the next release if it woul

linux-next: manual merge of the rockchip tree with the renesas tree

Hi Heiko, Today's linux-next merge of the rockchip tree got a conflict in: arch/arm64/configs/defconfig between commits: 93f7bfd930c0 ("arm64: defconfig: makes SND_SIMPLE_CARD to module") ddf3fa8b8a16 ("arm64: defconfig: Enable CONFIG_SND_AUDIO_GRAPH_CARD") from the renesas tree and comm