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

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

[Daniel Sangorrin]

This patch corrects a problem with the merge of a previous
patch to add the CONTEC identifier.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@gmail.com>
---
 drivers/usb/serial/ftdi_sio.c     |    1 -
 drivers/usb/serial/ftdi_sio_ids.h |    7 -------
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 79dd1ae..da7e334 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -653,7 +653,6 @@ static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
 	{ USB_DEVICE(EVOLUTION_VID, EVO_HYBRID_PID) },
 	{ USB_DEVICE(EVOLUTION_VID, EVO_RCM4_PID) },
-	{ USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h
b/drivers/usb/serial/ftdi_sio_ids.h
index 94d86c3..bbc159a 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -501,13 +501,6 @@
 #define CONTEC_COM1USBH_PID	0x8311	/* COM-1(USB)H */

 /*
- * Contec products (http://www.contec.com)
- * Submitted by Daniel Sangorrin
- */
-#define CONTEC_VID		0x06CE	/* Vendor ID */
-#define CONTEC_COM1USBH_PID	0x8311	/* COM-1(USB)H */
-
-/*
  * Definitions for B&B Electronics products.
  */
 #define BANDB_VID		0x0856	/* B&B Electronics Vendor ID */
-- 
1.7.0.4

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

[Greg KH]

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

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

[Daniel Sangorrin]

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?

Thanks!
Dani

On Fri, Jun 18, 2010 at 11:37 PM, Greg KH <gregkh@suse.de> wrote:
> 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
>

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

[Greg KH]

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