Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the asm-generic tree

Hi all, On Wed, 18 Oct 2023 12:46:36 +1100 Stephen Rothwell wrote: > > On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > arch/ia64/include/asm/fb.h > > > > between commit: > > > > cf8e8658100d

Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the asm-generic tree

Hi all, On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell wrote: > > 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

Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the asm-generic tree

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

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the asm-generic tree

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()")