linux-kernel - linux-next: manual merge of the drm tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20120503130725.5064b8c0fe9c072a8763d30e@canb.auug.org.au>
Date:	Thu, 3 May 2012 13:07:25 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dave Airlie <airlied@...ux.ie>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Chris Wilson <chris@...is-wilson.co.uk>
Subject: linux-next: manual merge of the drm tree with Linus' tree

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit 99d9acdd0c5c
("drm/i915: Do not set "Enable Panel Fitter" on SNB pageflips") from
Linus' tree and (I am not sure which) commits from the drm tree.

I fixed it up (the former patch got applied in completely the wrong place
by git merge).  This file looks like it was massively rewritten in the
drm tree :-(.  I have not included the merge diff because it was >2000
lines.

Dave, as an experiment, you might like to pull that former patch into
your tree and see if that fixes the merge with Linus' tree.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped