| Message ID | 20230106105042.6d7ccb97@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 |
diff --cc drivers/gpu/drm/tests/drm_format_helper_test.c index 567c71f95edc,f71dc0fe08a1..000000000000 --- a/drivers/gpu/drm/tests/drm_format_helper_test.c
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/tests/drm_format_helper_test.c between commit: a52a5451f43b ("kunit: Use KUNIT_EXPECT_MEMEQ macro") from Linus' tree and commits: f21d62c9ce3d ("drm/format-helper: Store RGB565 in little-endian order") 175073d694cd ("drm/format-helper: Add conversion from XRGB8888 to ARGB8888") 56119bfb3914 ("drm/format-helper: Add conversion from XRGB8888 to ARGB2101010") 10cd592e639e ("drm/format-helper: Add conversion from XRGB8888 to 15-bit RGB555 formats") 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.