Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning (rev2)
On Mon, Nov 27, 2017 at 2:26 AM, Joonas Lahtinen wrote: > On Sun, 2017-11-26 at 20:40 -0800, Nick Desaulniers wrote: >> In >> general, how do people find what tree they should be basing their >> patch off of? > > "T:" line from the MAINTAINERS entry would tell you that. Nice, thanks! ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning (rev2)
On Sun, 2017-11-26 at 20:40 -0800, Nick Desaulniers wrote: > Do I need to be basing my patches on a different tree than Linus'? In > general, how do people find what tree they should be basing their > patch off of? "T:" line from the MAINTAINERS entry would tell you that. Regards, Joonas -- Joonas Lahtinen Open Source Technology Center Intel Corporation ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning (rev2)
Do I need to be basing my patches on a different tree than Linus'? In general, how do people find what tree they should be basing their patch off of? On Sun, Nov 26, 2017 at 7:52 PM, Patchwork wrote: > == Series Details == > > Series: drm/i915: Avoid enum conversion warning (rev2) > URL : https://patchwork.freedesktop.org/series/34269/ > State : failure > > == Summary == > > Applying: drm/i915: Avoid enum conversion warning > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/intel_ddi.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/intel_ddi.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c > Patch failed at 0001 drm/i915: Avoid enum conversion warning > > Current HEAD: > commit 2ac27dcb0eb2b64104e890031705714051be9ef8 > Author: Chris Wilson > Date: Sun Nov 26 19:47:42 2017 + > > drm-tip: 2017y-11m-26d-19h-47m-14s UTC integration manifest > ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning (rev2)
== Series Details == Series: drm/i915: Avoid enum conversion warning (rev2) URL : https://patchwork.freedesktop.org/series/34269/ State : failure == Summary == Applying: drm/i915: Avoid enum conversion warning Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_ddi.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c Patch failed at 0001 drm/i915: Avoid enum conversion warning Current HEAD: commit 2ac27dcb0eb2b64104e890031705714051be9ef8 Author: Chris Wilson Date: Sun Nov 26 19:47:42 2017 + drm-tip: 2017y-11m-26d-19h-47m-14s UTC integration manifest ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning
== Series Details == Series: drm/i915: Avoid enum conversion warning URL : https://patchwork.freedesktop.org/series/34269/ State : failure == Summary == Applying: drm/i915: Avoid enum conversion warning Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_ddi.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c Patch failed at 0001 drm/i915: Avoid enum conversion warning Current HEAD: commit 9d399f81694538228a539de9a908cdf9ef00f814 Author: Tvrtko Ursulin Date: Thu Nov 23 12:29:07 2017 + drm-tip: 2017y-11m-23d-12h-28m-12s UTC integration manifest ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning
On Thu, Nov 23, 2017 at 08:58:47AM +, Patchwork wrote: > == Series Details == > > Series: drm/i915: Avoid enum conversion warning > URL : https://patchwork.freedesktop.org/series/34269/ > State : failure > > == Summary == This change does not apply cleanly on top of the commit below: > commit ffa17d69cf53bd5af4d7e41900c3ba40f6656e31 > Author: Chris Wilson > Date: Thu Nov 23 07:47:39 2017 + > > drm-tip: 2017y-11m-23d-07h-46m-50s UTC integration manifest Sorry for confusion. Typical PEBKAC on my side where I used ">" instead of ">>" which overwrote the message, instead of appending to it. Should be fixed from now on. -- Cheers, Arek ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning
== Series Details == Series: drm/i915: Avoid enum conversion warning URL : https://patchwork.freedesktop.org/series/34269/ State : failure == Summary == commit 606231c4d58188daa3a9a02ac6b95f42c4fcf267 Author: Joonas Lahtinen Date: Thu Nov 23 12:37:47 2017 +0200 drm-tip: 2017y-11m-23d-10h-35m-48s UTC integration manifest ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning
== Series Details == Series: drm/i915: Avoid enum conversion warning URL : https://patchwork.freedesktop.org/series/34269/ State : failure == Summary == commit ffa17d69cf53bd5af4d7e41900c3ba40f6656e31 Author: Chris Wilson Date: Thu Nov 23 07:47:39 2017 + drm-tip: 2017y-11m-23d-07h-46m-50s UTC integration manifest ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
