diff mbox series

linux-next: manual merge of the drm-misc tree with Linus' tree

Message ID 20230523104324.602c426a@canb.auug.org.au (mailing list archive)
State New, archived
Headers show
Series linux-next: manual merge of the drm-misc tree with Linus' tree | expand

Commit Message

Stephen Rothwell May 23, 2023, 12:43 a.m. UTC 
Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  MAINTAINERS

between commit:

  80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")

from Linus' tree and commit:

  0dd53308f74f ("MAINTAINERS: Add entry for Samsung S6D7AA0 LCD panel controller driver")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff mbox series

Patch

diff --cc MAINTAINERS
index 8e18bbafa740,7cc2bfa4af6f..000000000000
--- a/MAINTAINERS