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

[Greg KH]

On Mon, May 07, 2012 at 03:58:31PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/serial/68360serial.c between commit d29f3ef39be4
> ("tty_lock: Localise the lock") from the tty tree and commit 60e6d2689c2a
> ("staging: evict abandoned 68360serial.c driver from the kernel") from
> the staging tree.
> 
> The latter removed the file, so I did that.

That sounds correct, thanks for doing it.

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  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/