Messages in this thread | | | Date | Wed, 9 Dec 2009 15:38:19 +0100 (CET) | From | Jiri Kosina <> | Subject | Re: linux-next: manual merge of the tty tree with the trivial tree |
| |
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.
| |