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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.0912091536230.3755@pobox.suse.cz>
Date:	Wed, 9 Dec 2009 15:38:19 +0100 (CET)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Thadeu Lima de Souza Cascardo <cascardo@...oscopio.com>
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/