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] [day] [month] [year] [list]

Message-ID: <20091210143917.GA27161@kroah.com>
Date:	Thu, 10 Dec 2009 06:39:17 -0800
From:	Greg KH <greg@...ah.com>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	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 Thu, Dec 10, 2009 at 12:21:00PM +0100, Jiri Kosina wrote:
> On Wed, 9 Dec 2009, Greg KH 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.
> > 
> > Sounds good to me as well.
> 
> Linus has merged my tree, so either you or Linus will have to fix the 
> conflict.

Thanks, I'll fix it up in my tree.

greg k-h
--
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/