linux-kernel - Re: linux-next: manual merge of the tty.current tree with the net-current 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: <20090918172734.GA5543@kroah.com>
Date:	Fri, 18 Sep 2009 10:27:34 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Wolfram Sang <w.sang@...gutronix.de>,
	Ken Kawasaki <ken_kawasaki@...ing.nifty.jp>,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: linux-next: manual merge of the tty.current tree with the
 net-current tree

On Wed, Sep 16, 2009 at 07:12:02PM -0700, Greg KH wrote:
> On Thu, Sep 17, 2009 at 10:54:42AM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the tty.current tree got a conflict in
> > drivers/serial/serial_cs.c between commit
> > 531afd64d027e3d798c416b2b37b3cfb1de417d9 ("pcnet_cs: add cis of Linksys
> > multifunction pcmcia card") from the net-current tree and commit
> > 5cea4a4e15a918f19d32fd3dc9a5056f333847c3 ("tty: serial/pcmcia: add ID for
> > Advantech card") from the tty.current tree.
> > 
> > Just context changes.  I fixed it up (see below) and can carry the fix
> > for a while.
> 
> Thanks, I'll handle this when I sync back up with Linus's tree tomorrow.

Now fixed up.

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/