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>] [day] [month] [year] [list]

Message-Id: <20101004103054.faaf2ef9.sfr@canb.auug.org.au>
Date:	Mon, 4 Oct 2010 10:30:54 +1100
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,
	Daniel Vetter <daniel.vetter@...ll.ch>,
	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/drm_gem.c between commit
39b4d07aa3583ceefe73622841303a0a3e942ca1 ("drm: Hold the mutex when
dropping the last GEM reference (v2)") from Linus' tree and commit
fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b ("drm: kill
gem_free_object_unlocked driver callback") from the drm tree.

It looks like the former supercedes the latter, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped