Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
From: Jani Nikula
Date: Wed Dec 03 2014 - 03:24:06 EST
On Wed, 03 Dec 2014, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Dave,
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_display.c between commit b68362278af9
> ("drm/i915: More cautious with pch fifo underruns") from the
> drm-intel-fixes tree and commit a72e4c9f9a11 ("drm/i915: Use dev_priv
> in public intel_fifo_underrun.c functions") from the drm tree.
> I fixed it up (I used the drm tree version) and can carry the fix as
> necessary (no action is required).
b68362278af9 removes two lines of code; these should be removed in the
resolved version too.
Jani Nikula, Intel Open Source Technology Center
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/