Re: linux-next: manual merge of the staging tree with the mips tree
From: Greg KH
Date: Tue Jan 19 2010 - 16:18:52 EST
On Mon, Jan 18, 2010 at 06:53:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h between
> commit 8cdfa0e5f204ee97d27f742ebd207f4de8ca2984 ("Loongson: Change the
> Email address of Wu Zhangjin") from the mips tree and commit
> 1467bbc532da8c044e57706db232efe616ae5b00 ("staging: sm7xx: remove the
> buggy 2D acceleration support") from the staging tree.
> I just removed the 2 files (as was done in the staging tree).
Thanks, that's the correct patch.
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/