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

Hi, On Mon, Nov 21, 2016 at 3:19 PM, Stephen Rothwell wrote: > Hi Heiko, > > Today's linux-next merge of the rockchip tree got a conflict in: > > arch/arm64/configs/defconfig > > between commit: > > a59294b2f7c7 ("ARM64: defconfig: Enable MMC related configs") > > from the arm-soc tree and co

linux-next: manual merge of the rockchip tree with the arm-soc tree

Hi Heiko, Today's linux-next merge of the rockchip tree got a conflict in: arch/arm64/configs/defconfig between commit: a59294b2f7c7 ("ARM64: defconfig: Enable MMC related configs") from the arm-soc tree and commit: 5295a3157348 ("arm64: defconfig: enable RK808 components") from the ro