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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20120507134513.bffe9dbda0fac21e472215b5@canb.auug.org.au>
Date:	Mon, 7 May 2012 13:45:13 +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>,
	Daniel Vetter <daniel.vetter@...ll.ch>
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 074b5e1a99fb
("drm/i915: Do not read non-existent DPLL registers on PCH hardware")
from Linus' tree and I have no idea which commits from the drm tree.

I fixed it up (I think), but, again, the merge diff is way to log to
post ...

Again, Dave, can you cherry-pick or merge the commits that affect the drm
tree from Linus' tree, please?  Surely those fixes are needed in the drm
tree as well - or if they are not, then let me know and I will just use
the drm tree's version of this file.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped