Hi all,
On Mon, 24 Jun 2019 13:41:47 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> Documentation/fb/modedb.rst
>
> between commit:
>
> ab42b818954c ("docs: fb: convert docs to ReST and rename to *.rst")
>
> from the jc_docs tree and co
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
Documentation/fb/modedb.rst
between commit:
ab42b818954c ("docs: fb: convert docs to ReST and rename to *.rst")
from the jc_docs tree and commit:
1bf4e09227c3 ("drm/modes: Allow to specify rotation and reflection on the
