public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: Daniel Sangorrin <daniel.sangorrin@gmail.com>
Cc: 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: Fri, 18 Jun 2010 07:37:27 -0700	[thread overview]
Message-ID: <20100618143727.GA16398@suse.de> (raw)
In-Reply-To: <AANLkTimx1HWYzG0qQqP12ObWQI1eiH5SoFpRic06uN3f@mail.gmail.com>

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

  reply	other threads:[~2010-06-18 14:46 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 [this message]
2010-06-21  2:08   ` Daniel Sangorrin
2010-06-21 21:18     ` Greg KH

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=20100618143727.GA16398@suse.de \
    --to=gregkh@suse.de \
    --cc=andi@lisas.de \
    --cc=daniel.sangorrin@gmail.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox