* [Intel-gfx] Merge conflict between drm-next and drm-tip
@ 2020-03-02 9:18 Thomas Zimmermann
2020-03-02 9:24 ` Jani Nikula
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Zimmermann @ 2020-03-02 9:18 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
[-- Attachment #1.1.1: Type: text/plain, Size: 793 bytes --]
Hi!
I get a conflict when merging drm-next into drm-tip as part of 'dim
push-branch'.
The conflicting patches appear to be
commit 1c4d821db919366034dc9ff4c01b4b0da0b8e30f
Author: Anshuman Gupta <anshuman.gupta@intel.com>
Date: Thu Oct 3 13:47:37 2019 +0530
drm/i915/tgl: Switch between dc3co and dc5 based on display idleness
and
commit ceaaf5300f881e54bba4221a710a40b48423f610
Author: José Roberto de Souza <jose.souza@intel.com>
Date: Wed Feb 5 13:49:45 2020 -0800
drm/i915/dc3co: Add description of how it works
Best regards
Thomas
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #1.2: OpenPGP digital signature --]
[-- 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] 2+ messages in thread
* Re: [Intel-gfx] Merge conflict between drm-next and drm-tip
2020-03-02 9:18 [Intel-gfx] Merge conflict between drm-next and drm-tip Thomas Zimmermann
@ 2020-03-02 9:24 ` Jani Nikula
0 siblings, 0 replies; 2+ messages in thread
From: Jani Nikula @ 2020-03-02 9:24 UTC (permalink / raw)
To: Thomas Zimmermann, Intel Graphics Development; +Cc: Daniel Vetter
On Mon, 02 Mar 2020, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> I get a conflict when merging drm-next into drm-tip as part of 'dim
> push-branch'.
It's mine, doing drm-intel-fixes, I'll take care of it.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-02 9:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-02 9:18 [Intel-gfx] Merge conflict between drm-next and drm-tip Thomas Zimmermann
2020-03-02 9:24 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox