Re: linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree

On Tue, May 15, 2018 at 1:09 AM, Stephen Rothwell wrote: > Hi all, > > On Thu, 10 May 2018 09:16:34 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the samsung-krzk tree got a conflict in: >> >> arch/arm/mach-exynos/Kconfig >> >> between commit: >> >> 4965a68780c5 ("arch: d

Re: linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree

Hi all, On Thu, 10 May 2018 09:16:34 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the samsung-krzk tree got a conflict in: > > arch/arm/mach-exynos/Kconfig > > between commit: > > 4965a68780c5 ("arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in > lib/Kconfig") > >

linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree

Hi Krzysztof, Today's linux-next merge of the samsung-krzk tree got a conflict in: arch/arm/mach-exynos/Kconfig between commit: 4965a68780c5 ("arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in lib/Kconfig") from the dma-mapping tree and commit: c5deb598089c ("ARM: exynos: Remove