Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree

[Stephen Rothwell]

Hi Jani,

On Fri, 05 Jun 2015 11:03:20 +0300 Jani Nikula <jani.nikula@xxxxxxxxx> wrote:
>
> On Fri, 05 Jun 2015, "mpe@xxxxxxxxxxxxxx" <michael@xxxxxxxxxx> wrote:
> > Hi Dave,
> >
> > Today's linux-next merge of the drm tree got a conflict in
> > drivers/gpu/drm/i915/intel_ringbuffer.c between commit 4f47c99a9be7 ("drm/i915:
> > Move WaBarrierPerformanceFixDisable:skl to skl code from chv code") from the
> > drm-intel-fixes tree and commit b62adbd1ea1f ("drm/i915/bxt: Move
> > WaForceEnableNonCoherent to Skylake only") from the drm tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> Our tree seems to have the if blocks the other way round. I don't think
> it matters, but Ville, Damien, chime in if you think it does.

I have switched them around today.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpDUbjWBTvZp.pgp
Description: OpenPGP digital signature