On Wed, Apr 30, 2014 at 7:38 AM, Jani Nikula <jani.nikula@xxxxxxxxx> wrote:
> On Wed, 30 Apr 2014, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>> Hi all,
>>
>> Today's linux-next merge of the drm-intel tree got a conflict in
>> drivers/gpu/drm/i915/i915_gem_gtt.c between commitcfa7c862982b
>> ("drm/i915: Sanitize the enable_ppgtt module option once") from the
>> drm-intel-fixes tree tree and commit 5db6c735ead5 ("drm/i915: dmesg
>> output for VT-d testing") from the drm-intel tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Hi Stephen -
>
> [off-list to not confuse everyone; I'll confuse just you instead!]
Re-adding linux-next since it might be interesting for others.
> IIUC you pull both our for-linux-next-fixes and for-linux-next
> branches. There's bound to be occasional conflicts, as the former is
> based on Linus' tree with fixes for -rc and -stable, and the latter
> contains the new development for -next.
>
> Now, every time Daniel or I push to either one, we reconstruct our
> drm-intel-nightly branch [1] which merges both (and then some). Which
> means we've already resolved any conflicts once (and have some tooling
> to share the conflict resolutions between ourselves). If you look at the
> merge commits there, you'll see how we have resolved the conflicts.
>
> As far as I can tell you and the other linux-next maintainers have done
> a good job resolving our conflicts for -next (also this time), but I am
> wondering whether that's a burden that could be reduced. At the very
> least there's our -nightly branch you can look at if in doubt.
>
> Thoughts?
On that topic we have a rerere-cache branch in the drm-intel.git repo
which contains the .git/rr-cache directory plus any manual fixup
patches we need. That might be easier for peeking merge resolutions.
Another issue I wonder about is topic branches. We've started to use
them a bit more the past releases, but most of them are fairly
temporary in nature. I.e. I pull in reviewed patches into a new topic/
branch, let it soak for a bit and then either send the pull request to
Dave directly or merge it into drm-intel-next-queued. topic/core-stuff
is the only stable topic branch (contains random non-i915 drm patches
I pick up) so would imo make sense to add it to linux-next. But I'm
not sure about the others.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
