linux-kernel - Re: [PATCH] USB: serial: ftdi: correct merge conflict with CONTEC id

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: <20100618143727.GA16398@suse.de>
Date:	Fri, 18 Jun 2010 07:37:27 -0700
From:	Greg KH <gregkh@...e.de>
To:	Daniel Sangorrin <daniel.sangorrin@...il.com>
Cc:	Andreas Mohr <andi@...as.de>, Radek Liboska <liboska@...hb.cas.cz>,
	linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] USB: serial: ftdi: correct merge conflict with CONTEC
 id

On Fri, Jun 18, 2010 at 03:30:02PM +0900, Daniel Sangorrin wrote:
> This patch corrects a problem with the merge of a previous
> patch to add the CONTEC identifier.

What patch had the merge problem?  Did I just end up duplicating stuff
incorrectly?  What was the git commit id?

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/