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

Hi all, On Tue, 30 Apr 2019 17:40:51 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the char-misc tree got conflicts in: > > drivers/misc/Kconfig > drivers/misc/Makefile > > between commit: > > 524feb799408 ("soc: add aspeed folder and misc drivers") > > from the arm-soc

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

On Tue, Apr 30, 2019 at 05:40:51PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got conflicts in: > > drivers/misc/Kconfig > drivers/misc/Makefile > > between commit: > > 524feb799408 ("soc: add aspeed folder and misc drivers") > > from the

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

* Stephen Rothwell [141120 22:26]: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in > arch/arm/mach-omap2/Kconfig between commit 9e1e632c4846 ("ARM: OMAP2+: > Drop board file for ti8168evm") from the arm-soc tree and commit > 184901a06a36 ("ARM: removing support for