linux-kernel - Re: linux-next: manual merge of the usb tree with the ttydev 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: <20090603150017.GD30890@kroah.com>
Date:	Wed, 3 Jun 2009 08:00:17 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Alan Cox <alan@...rguk.ukuu.org.uk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Craig Shelley <craig@...rotron.org.uk>
Subject: Re: linux-next: manual merge of the usb tree with the ttydev tree

On Wed, Jun 03, 2009 at 08:46:55PM +1000, Stephen Rothwell wrote:
> Hi Alan,
> 
> On Wed, 3 Jun 2009 09:55:47 +0100 Alan Cox <alan@...rguk.ukuu.org.uk> wrote:
> >
> > > As a side issue, the last patch has no SOB from Craig in the ttydev tree.
> > 
> > Yes it does...
> > 
> >     Signed-off-by: Craig Shelley <craig@...rotron.org.uk>
> >     
> >     (Fixed some collisions merging)
> >     
> >     Signed-off-by: Alan Cox <alan@...ux.intel.com>
> 
> Sorry, going blind in my old age :-)
> 
> > > So, I just used the ttydev tree version on the assumption that my
> > > reasoning above is correct.
> > 
> > and the ttydev tree one is the one to use
> 
> Thanks for the confirmation.

Ok, I'll drop these three patches from my tree.

thanks,

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/