Re: linux-next: manual merge of the drm tree with the crypto tree

2020-12-15 Thread mark gross
On Tue, Dec 15, 2020 at 10:58:52AM +0100, Geert Uytterhoeven wrote: > On Mon, Dec 14, 2020 at 2:44 PM Stephen Rothwell > wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > > > MAINTAINERS > > > > between commit: > > > > 885743324513 ("crypto: keembay - Add support for

Re: linux-next: manual merge of the drm tree with the crypto tree

2020-12-15 Thread Geert Uytterhoeven
On Mon, Dec 14, 2020 at 2:44 PM Stephen Rothwell wrote: > Today's linux-next merge of the drm tree got a conflict in: > > MAINTAINERS > > between commit: > > 885743324513 ("crypto: keembay - Add support for Keem Bay OCS AES/SM4") > > from the crypto tree and commit: > > ed794057b052 ("drm/km

linux-next: manual merge of the drm tree with the crypto tree

2020-12-13 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm tree got a conflict in: MAINTAINERS between commit: 885743324513 ("crypto: keembay - Add support for Keem Bay OCS AES/SM4") from the crypto tree and commit: ed794057b052 ("drm/kmb: Build files for KeemBay Display driver") from the drm tree.