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]

Date:	Thu, 10 Dec 2009 02:11:00 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
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

Hi Jiri,

On Wed, 9 Dec 2009 15:38:19 +0100 (CET) Jiri Kosina <jkosina@...e.cz> wrote:
>
> On Wed, 9 Dec 2009, Stephen Rothwell wrote:
> 
> > I just used the tty tree version where they clashed.  Jiri, you might
> > consider sending that patch to Greg for the tty tree.
> 
> 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.

OK, that's fine, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped