* linux-next: manual merge of the staging tree with the drm tree
@ 2018-11-20 2:16 Stephen Rothwell
2018-11-20 8:54 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-11-20 2:16 UTC (permalink / raw)
To: Greg KH, Dave Airlie, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Christian König, Alex Deucher, Hans de Goede
[-- Attachment #1: Type: text/plain, Size: 794 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/vboxvideo/vbox_ttm.c
between commits:
a64f784bb14a ("drm/ttm: initialize globals during device init (v2)")
from the drm tree and commit:
cd76c287a52f ("staging: vboxvideo: Cleanup the comments")
from the staging tree.
I fixed it up (the former removed the comments updated by the latter) 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] 2+ messages in thread* Re: linux-next: manual merge of the staging tree with the drm tree
2018-11-20 2:16 linux-next: manual merge of the staging tree with the drm tree Stephen Rothwell
@ 2018-11-20 8:54 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2018-11-20 8:54 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Christian König, Alex Deucher,
Hans de Goede
On Tue, Nov 20, 2018 at 01:16:16PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/vboxvideo/vbox_ttm.c
>
> between commits:
>
> a64f784bb14a ("drm/ttm: initialize globals during device init (v2)")
>
> from the drm tree and commit:
>
> cd76c287a52f ("staging: vboxvideo: Cleanup the comments")
>
> from the staging tree.
>
> I fixed it up (the former removed the comments updated by the latter) 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.
Fix seems sane to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-20 8:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-20 2:16 linux-next: manual merge of the staging tree with the drm tree Stephen Rothwell
2018-11-20 8:54 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox