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 arm-soc tree and commit:
>
> 01c60dcea9f7 ("drivers/misc: Add Aspeed P2A control driver")
>
> from the char-misc tree.
>
> I fixed it up (see below - though the additions probably want to be
> moved as in the arm-soc commit)
People are still arguing about this, so let's leave this as-is for now
:)
Thanks for the merge resolution,
greg k-h
