linux-next: manual merge of the drm-misc tree with the asm-generic tree

linux-next: manual merge of the drm-misc tree with the asm-generic tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 763 bytes --]

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
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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drm-misc tree with the asm-generic tree

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 1069 bytes --]


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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: linux-next: manual merge of the drm-misc tree with the asm-generic tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 962 bytes --]

Hi all,

On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 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
> 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.

This is now a conflict between the asm-generic tree and the drm tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drm-misc tree with the asm-generic tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]

Hi all,

On Wed, 18 Oct 2023 12:46:36 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 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
> > 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.  
> 
> This is now a conflict between the asm-generic tree and the drm tree.

And now between the asm-generic tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]