Am 13.10.23 um 02:46 schrieb Stephen Rothwell:
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
arch/ia64/include/asm/fb.h
between commit:
cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
from the asm-generic tree and commit:
052ddf7b86d2 ("fbdev: Replace fb_pgprotect() with pgprot_framebuffer()")
from the drm-misc tree.
I fixed it up (I just removed the file) and can carry the fix as
Thanks.
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.
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Attachment:
OpenPGP_signature.asc
Description: OpenPGP digital signature
