public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: H Hartley Sweeten <hartleys@visionengravers.com>
Cc: "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
	"fmhess@users.sourceforge.net" <fmhess@users.sourceforge.net>,
	"abbotti@mev.co.uk" <abbotti@mev.co.uk>,
	Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] staging: comedi: skel: use module_comedi_{pci_,}driver()
Date: Wed, 20 Jun 2012 17:28:30 -0700	[thread overview]
Message-ID: <20120621002830.GA3255@kroah.com> (raw)
In-Reply-To: <ADE657CA350FB648AAC2C43247A983F0020698E7708B@AUSP01VMBX24.collaborationhost.net>

On Wed, Jun 20, 2012 at 07:21:04PM -0500, H Hartley Sweeten wrote:
> On Wednesday, June 20, 2012 4:24 PM, Greg KH wrote:
> > On Wed, Jun 20, 2012 at 06:16:52PM -0500, H Hartley Sweeten wrote:
> >> Hmm. It was based on next-20120620 and created with git format-patch.
> >> 
> >> Do you have any other patches to that file in your staging tree that
> >> have not reached the next tree yet?
> >
> > Possibly, depending on when -next was created, I did just apply a bunch
> > of other patches a few hours ago.
> >
> >> Regardless, I have some other cleanup patches for that file. I'll
> >> put them together as a series and repost it later.
> >
> > That would be great, thanks.
> 
> Not a problem.
> 
> Question.
> 
> Is there a way to do a 'git commit' with the diff generated using the
> "patience diff" algorithm?

I have no idea what that is.

> I have a patch that is really ugly when I do the git commit but looks
> ok if I do a 'git diff --patience'.

It's ok, send it on, I'll figure it out :)

thanks,

greg k-h

  reply	other threads:[~2012-06-21  0:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-20 22:56 [PATCH] staging: comedi: skel: use module_comedi_{pci_,}driver() H Hartley Sweeten
2012-06-20 23:12 ` Greg KH
2012-06-20 23:16   ` H Hartley Sweeten
2012-06-20 23:23     ` Greg KH
2012-06-21  0:21       ` H Hartley Sweeten
2012-06-21  0:28         ` Greg KH [this message]
2012-06-21  9:01         ` Ian Abbott

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=20120621002830.GA3255@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=abbotti@mev.co.uk \
    --cc=devel@driverdev.osuosl.org \
    --cc=fmhess@users.sourceforge.net \
    --cc=hartleys@visionengravers.com \
    --cc=linux-kernel@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