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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 9 Jun 2015 11:58:09 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jani Nikula <jani.nikula@...el.com>
Cc:	<mpe@...erman.id.au>, Dave Airlie <airlied@...ux.ie>,
	Daniel Vetter <daniel.vetter@...ll.ch>,
	intel-gfx@...ts.freedesktop.org, dri-devel@...ts.freedesktop.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nick Hoath <nicholas.hoath@...el.com>,
	Ville Syrjälä <ville.syrjala@...ux.intel.com>,
	"Damien Lespiau" <damien.lespiau@...el.com>
Subject: Re: linux-next: manual merge of the drm tree with the
 drm-intel-fixes tree

Hi Jani,

On Fri, 05 Jun 2015 11:03:20 +0300 Jani Nikula <jani.nikula@...el.com> wrote:
>
> On Fri, 05 Jun 2015, "mpe@...erman.id.au" <michael@...abs.org> 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@...b.auug.org.au

Content of type "application/pgp-signature" skipped