* linux-next: manual merge of the drm-misc tree with the drm-next tree
@ 2021-07-27 11:14 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2021-07-27 11:14 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Zack Rusin
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
between commit:
ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
from the drm-next tree and commit:
be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
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.
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 356f82c26f59,5652d982b1ce..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
^ permalink raw reply [flat|nested] 9+ messages in thread* [Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-next tree
@ 2021-07-27 11:14 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2021-07-27 11:14 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Zack Rusin
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
between commit:
ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
from the drm-next tree and commit:
be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
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.
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 356f82c26f59,5652d982b1ce..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* linux-next: manual merge of the drm-misc tree with the drm-next tree
@ 2021-07-27 11:14 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2021-07-27 11:14 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
between commit:
ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
from the drm-next tree and commit:
be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
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.
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 356f82c26f59,5652d982b1ce..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the drm-next tree
2021-07-27 11:14 ` Mark Brown
(?)
@ 2021-07-27 11:41 ` Daniel Vetter
-1 siblings, 0 replies; 9+ messages in thread
From: Daniel Vetter @ 2021-07-27 11:41 UTC (permalink / raw)
To: Mark Brown
Cc: Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Zack Rusin
On Tue, Jul 27, 2021 at 1:15 PM Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
>
> between commit:
>
> ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
>
> from the drm-next tree and commit:
>
> be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
>
> from the drm-misc tree.
I got confused for a bit how we managed a conflict here because vmwgfx
flows drm-misc.git -> drm.git -> linus. The 2nd patch is in
drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed
at first drm-misc means.
-Daniel
> 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.
>
> diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> index 356f82c26f59,5652d982b1ce..000000000000
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-next tree
@ 2021-07-27 11:41 ` Daniel Vetter
0 siblings, 0 replies; 9+ messages in thread
From: Daniel Vetter @ 2021-07-27 11:41 UTC (permalink / raw)
To: Mark Brown
Cc: Intel Graphics, Linux Next Mailing List,
Linux Kernel Mailing List, DRI, Zack Rusin
On Tue, Jul 27, 2021 at 1:15 PM Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
>
> between commit:
>
> ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
>
> from the drm-next tree and commit:
>
> be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
>
> from the drm-misc tree.
I got confused for a bit how we managed a conflict here because vmwgfx
flows drm-misc.git -> drm.git -> linus. The 2nd patch is in
drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed
at first drm-misc means.
-Daniel
> 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.
>
> diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> index 356f82c26f59,5652d982b1ce..000000000000
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the drm-next tree
@ 2021-07-27 11:41 ` Daniel Vetter
0 siblings, 0 replies; 9+ messages in thread
From: Daniel Vetter @ 2021-07-27 11:41 UTC (permalink / raw)
To: Mark Brown
Cc: Intel Graphics, Linux Next Mailing List, Linux Kernel Mailing List, DRI
On Tue, Jul 27, 2021 at 1:15 PM Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
>
> between commit:
>
> ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
>
> from the drm-next tree and commit:
>
> be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
>
> from the drm-misc tree.
I got confused for a bit how we managed a conflict here because vmwgfx
flows drm-misc.git -> drm.git -> linus. The 2nd patch is in
drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed
at first drm-misc means.
-Daniel
> 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.
>
> diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> index 356f82c26f59,5652d982b1ce..000000000000
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the drm-next tree
2021-07-27 11:41 ` Daniel Vetter
(?)
@ 2021-07-27 12:01 ` Mark Brown
-1 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2021-07-27 12:01 UTC (permalink / raw)
To: Daniel Vetter
Cc: Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Zack Rusin
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
On Tue, Jul 27, 2021 at 01:41:30PM +0200, Daniel Vetter wrote:
> On Tue, Jul 27, 2021 at 1:15 PM Mark Brown <broonie@kernel.org> wrote:
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> > between commit:
> > ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
> > from the drm-next tree and commit:
> > be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
> > from the drm-misc tree.
> I got confused for a bit how we managed a conflict here because vmwgfx
> flows drm-misc.git -> drm.git -> linus. The 2nd patch is in
> drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed
> at first drm-misc means.
I probably misidentified the tree when I was reporting things TBH -
there's so many DRM trees and they're constantly generating conflicts
that I sometimes rush through it a bit, especially for the simpler ones
like this.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-next tree
@ 2021-07-27 12:01 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2021-07-27 12:01 UTC (permalink / raw)
To: Daniel Vetter
Cc: Intel Graphics, Linux Next Mailing List,
Linux Kernel Mailing List, DRI, Zack Rusin
[-- Attachment #1.1: Type: text/plain, Size: 918 bytes --]
On Tue, Jul 27, 2021 at 01:41:30PM +0200, Daniel Vetter wrote:
> On Tue, Jul 27, 2021 at 1:15 PM Mark Brown <broonie@kernel.org> wrote:
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> > between commit:
> > ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
> > from the drm-next tree and commit:
> > be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
> > from the drm-misc tree.
> I got confused for a bit how we managed a conflict here because vmwgfx
> flows drm-misc.git -> drm.git -> linus. The 2nd patch is in
> drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed
> at first drm-misc means.
I probably misidentified the tree when I was reporting things TBH -
there's so many DRM trees and they're constantly generating conflicts
that I sometimes rush through it a bit, especially for the simpler ones
like this.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: manual merge of the drm-misc tree with the drm-next tree
@ 2021-07-27 12:01 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2021-07-27 12:01 UTC (permalink / raw)
To: Daniel Vetter
Cc: Intel Graphics, Linux Next Mailing List, Linux Kernel Mailing List, DRI
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
On Tue, Jul 27, 2021 at 01:41:30PM +0200, Daniel Vetter wrote:
> On Tue, Jul 27, 2021 at 1:15 PM Mark Brown <broonie@kernel.org> wrote:
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> > between commit:
> > ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
> > from the drm-next tree and commit:
> > be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
> > from the drm-misc tree.
> I got confused for a bit how we managed a conflict here because vmwgfx
> flows drm-misc.git -> drm.git -> linus. The 2nd patch is in
> drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed
> at first drm-misc means.
I probably misidentified the tree when I was reporting things TBH -
there's so many DRM trees and they're constantly generating conflicts
that I sometimes rush through it a bit, especially for the simpler ones
like this.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-07-27 12:01 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-27 11:14 linux-next: manual merge of the drm-misc tree with the drm-next tree Mark Brown
2021-07-27 11:14 ` [Intel-gfx] " Mark Brown
2021-07-27 11:14 ` Mark Brown
2021-07-27 11:41 ` Daniel Vetter
2021-07-27 11:41 ` [Intel-gfx] " Daniel Vetter
2021-07-27 11:41 ` Daniel Vetter
2021-07-27 12:01 ` Mark Brown
2021-07-27 12:01 ` [Intel-gfx] " Mark Brown
2021-07-27 12:01 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.