USB: serial: ftdi: correct merge conflict with CONTEC id
in [Kernel]
|
Prev: 2.6.35-rc3 BUG: unable to handle kernel paging request at 0000000000004008
Next: perf: excluding "." and ".." directories when calculating tids.
From: Greg KH on 18 Jun 2010 10:50 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(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 21 Jun 2010 17:50
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-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |