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

[Greg KH <greg@xxxxxxxxx>]

On Mon, Jun 21, 2010 at 11:08:19AM +0900, Daniel Sangorrin wrote:
> Hi Greg,
> 
> I believe the merge problem occurred with the commit:
> 
> dee5658b482e9e2ac7d6205dc876fc11d4008138
> 
> Originally I submitted a patch and then they asked me to order the IDs
> and resubmit, so did I. But unfortunately in the end somehow both
> patches were merged.
> 
> [PATCH] USB: serial: ftdi: add CONTEC vendor and product id
> [PATCH resubmit] USB: serial: ftdi: add CONTEC vendor and product id
> 
> Was I supposed to do the resubmit patch in a way that would unpatch
> the first patch? Or is the word resubmit enough to know that this is
> the good patch?

This is good, I just wanted to know this information as to what went
wrong.  I'll put this into the changelog entry.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html