All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Daniel Sangorrin <daniel.sangorrin@gmail.com>
Cc: Greg KH <gregkh@suse.de>, Andreas Mohr <andi@lisas.de>,
	Radek Liboska <liboska@uochb.cas.cz>,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] USB: serial: ftdi: correct merge conflict with CONTEC id
Date: Mon, 21 Jun 2010 14:18:08 -0700	[thread overview]
Message-ID: <20100621211808.GA25511@kroah.com> (raw)
In-Reply-To: <AANLkTinPDECqU-GYKpD7_2IHb2qKjhCnViXkPDqN_cpu@mail.gmail.com>

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

      reply	other threads:[~2010-06-21 21:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-18  6:30 [PATCH] USB: serial: ftdi: correct merge conflict with CONTEC id Daniel Sangorrin
2010-06-18 14:37 ` Greg KH
2010-06-21  2:08   ` Daniel Sangorrin
2010-06-21 21:18     ` Greg KH [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100621211808.GA25511@kroah.com \
    --to=greg@kroah.com \
    --cc=andi@lisas.de \
    --cc=daniel.sangorrin@gmail.com \
    --cc=gregkh@suse.de \
    --cc=liboska@uochb.cas.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.