lkml.org 
[lkml]   [2009]   [Aug]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the drm tree with the net tree
From
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 31 Aug 2009 14:21:05 +1000

> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> firmware/Makefile between commit 2e8c07c35b3ffee7689406be61fd1448ee45d3cd
> ("cxgb3: use request_firmware() for the EDC registers setup") from the
> net tree and commit ece2be7993cc5e269cbf0cad6442b401a2c31915 ("drm/mga:
> Use request_firmware() to load microcode") from the drm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

This looks fine, please carry the fix until we all merge this stuff
in during the merge window :-)


\
 
 \ /
  Last update: 2009-08-31 06:31    [W:0.017 / U:10.504 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site