Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753386Ab2FUAVI (ORCPT ); Wed, 20 Jun 2012 20:21:08 -0400 Received: from mail131.messagelabs.com ([216.82.242.99]:52861 "EHLO mail131.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750754Ab2FUAVH convert rfc822-to-8bit (ORCPT ); Wed, 20 Jun 2012 20:21:07 -0400 X-Env-Sender: hartleys@visionengravers.com X-Msg-Ref: server-9.tower-131.messagelabs.com!1340238065!19854832!1 X-Originating-IP: [216.166.12.97] X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked From: H Hartley Sweeten To: Greg KH CC: "devel@driverdev.osuosl.org" , "fmhess@users.sourceforge.net" , "abbotti@mev.co.uk" , Linux Kernel Date: Wed, 20 Jun 2012 19:21:04 -0500 Subject: RE: [PATCH] staging: comedi: skel: use module_comedi_{pci_,}driver() Thread-Topic: [PATCH] staging: comedi: skel: use module_comedi_{pci_,}driver() Thread-Index: Ac1PO7hFL/hjfnVaRGu5Ag7IB+kUkwAB6Kcw Message-ID: References: <201206201556.51336.hartleys@visionengravers.com> <20120620231230.GA28411@kroah.com> <20120620232331.GA25587@kroah.com> In-Reply-To: <20120620232331.GA25587@kroah.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1075 Lines: 33 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 a patch that is really ugly when I do the git commit but looks ok if I do a 'git diff --patience'. Regards, Hartley -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/