Re: linux-next: manual merge of the drm tree with the net tree

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
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 :-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/