lkml.org 
[lkml]   [2013]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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/radeon/radeon_connectors.c between commit 108dc8e8b44a
("drm/radeon: rework audio option") from Linus' tree and commit
ad41550666f8 ("drm/radeon: enable hdmi audio by default") from the drm
tree.

I fixed it up (I used the latter version) and can carry the fix as
necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-11-07 04:01    [W:0.022 / U:0.456 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site