[<prev] [next>] [day] [month] [year] [list]
Date: Mon, 12 Dec 2011 13:06:08 +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,
Ben Skeggs <bskeggs@...hat.com>,
Jerome Glisse <jglisse@...hat.com>,
Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
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/nouveau/nouveau_sgdma.c between commit a10e9e1dbb39
("drm/nouveau: fix oopses caused by clear being called on unpopulated
ttms") from Linus' tree and commit 649bf3ca7734 ("drm/ttm: merge
ttm_backend and ttm_tt V5") from the drm tree.
I have no idea how to fix this up, so I just used the version from the
drm tree.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists