* linux-next: manual merge of the drm-misc tree with the asm-generic tree
@ 2023-10-13 0:46 Stephen Rothwell
2023-10-13 6:57 ` Thomas Zimmermann
2023-10-18 1:46 ` Stephen Rothwell
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2023-10-13 0:46 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Arnd Bergmann
Cc: Ard Biesheuvel, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Zimmermann
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the asm-generic tree
2023-10-13 0:46 linux-next: manual merge of the drm-misc tree with the asm-generic tree Stephen Rothwell
@ 2023-10-13 6:57 ` Thomas Zimmermann
2023-10-18 1:46 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Zimmermann @ 2023-10-13 6:57 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Arnd Bergmann
Cc: Linux Next Mailing List, Ard Biesheuvel,
Linux Kernel Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the asm-generic tree
2023-10-13 0:46 linux-next: manual merge of the drm-misc tree with the asm-generic tree Stephen Rothwell
2023-10-13 6:57 ` Thomas Zimmermann
@ 2023-10-18 1:46 ` Stephen Rothwell
2023-11-01 21:37 ` Stephen Rothwell
1 sibling, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2023-10-18 1:46 UTC (permalink / raw)
To: Arnd Bergmann, Dave Airlie
Cc: Daniel Vetter, Intel Graphics, DRI, Ard Biesheuvel,
Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the asm-generic tree
2023-10-18 1:46 ` Stephen Rothwell
@ 2023-11-01 21:37 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2023-11-01 21:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Dave Airlie, Daniel Vetter, Intel Graphics, DRI, Ard Biesheuvel,
Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-11-01 21:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-13 0:46 linux-next: manual merge of the drm-misc tree with the asm-generic tree Stephen Rothwell
2023-10-13 6:57 ` Thomas Zimmermann
2023-10-18 1:46 ` Stephen Rothwell
2023-11-01 21:37 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox