Re: linux-next: manual merge of the staging-next tree with the rrtree

From: Greg KH
Date: Mon May 17 2010 - 14:20:45 EST

On Mon, May 17, 2010 at 03:44:52PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/rtl8187se/r8180_core.c between commit
> 9080984577cb3e04226d94c8f733534b60541f01
> ("param:remove-useless-writable-charp") from the rr tree and commit
> bbfb56520c8da666383c08220985495ff918d4ad ("") from the staging-next tree.
> I fixed it up (see below) and can carry the fix as necessary.

Looks good, thanks.

greg k-h
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at