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

[Jiri Kosina]

On Wed, 9 Dec 2009, Stephen Rothwell wrote:

> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in 
> drivers/mmc/card/sdio_uart.c between commit 
> 1e04b7ae709d19d5c9f69c64e1e30253018ce102 ("sdio_uart: coding style 
> fixes") from the trivial tree and various commits from the tty tree.
> 
> I just used the tty tree version where they clashed.  Jiri, you might
> consider sending that patch to Greg for the tty tree.

Hi,

the trivial tree pull request has already been sent to Linus a day ago. I 
am now waiting whether it will be merged or missed.

In the latter case, I will split the tty hunk out and send to Greg. In the 
former case the conflict would have to be solved either by Greg or Linus.

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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/