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

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: Documentation/driver-api/infrastructure.rst between commits: 3080b056b3d4 ("docs/driver-api: Apply changed source file names") 868c97a846a7 ("dma-buf: Extract dma-buf.rst") from the jc_docs tree and commit:

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

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: Documentation/driver-api/infrastructure.rst between commits: 3080b056b3d4 ("docs/driver-api: Apply changed source file names") 868c97a846a7 ("dma-buf: Extract dma-buf.rst") from the jc_docs tree and commit:

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

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: Documentation/index.rst between commit: 17defc282fe6 ("Documentation: add meta-documentation for Sphinx and kernel-doc") from the jc_docs tree and commit: cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted

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

Hi Dave, Today's linux-next merge of the drm tree got a conflict in: Documentation/index.rst between commit: 17defc282fe6 ("Documentation: add meta-documentation for Sphinx and kernel-doc") from the jc_docs tree and commit: cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted