Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757773Ab2ENUJF (ORCPT ); Mon, 14 May 2012 16:09:05 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:59782 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757660Ab2ENUJD (ORCPT ); Mon, 14 May 2012 16:09:03 -0400 Date: Mon, 14 May 2012 13:08:59 -0700 From: Greg KH To: Alan Stern Cc: Tejun Heo , "Eric W. Biederman" , Peter Zijlstra , Kernel development list Subject: Re: [PATCH] sysfs: get rid of some lockdep false positives Message-ID: <20120514200859.GA16102@kroah.com> References: <20120514191853.GA4344@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2223 Lines: 53 On Mon, May 14, 2012 at 04:03:59PM -0400, Alan Stern wrote: > On Mon, 14 May 2012, Greg KH wrote: > > > > --- > > > > > > drivers/usb/core/sysfs.c | 6 +++--- > > > fs/sysfs/dir.c | 31 ++++++++++++++++++++++++++----- > > > include/linux/device.h | 3 +++ > > > include/linux/sysfs.h | 12 ++++++++++++ > > > 4 files changed, 44 insertions(+), 8 deletions(-) > > > > > > Index: usb-3.4/include/linux/sysfs.h > > > =================================================================== > > > --- usb-3.4.orig/include/linux/sysfs.h > > > +++ usb-3.4/include/linux/sysfs.h > > > > Just a note about this patch, from a meta-point of view (I have no > > objection to the patch at all, I'll go apply it in a bit.) > > > > You do use git to generate these patches, right? Or are you using > > something else? The "Index:" lines seem odd, like cvs things. > > No, I use quilt, with QUILT_REFRESH_ARGS set to "--diffstat > --no-timestamps -p1" in my .quiltrc file. There's an option to > suppress the Index: lines but I never bothered to set it. > > > Also, I just learned about the '--3way' option to 'git am', which, when > > I have merge problems with a patch (like, for example this one, which > > had rejects in the device.h portion), should be able to help me out, if > > you used git to generate the patch. > > > > But, if you don't use git, no problems, I was just curious as to what > > was creating the "Index:" lines. > > They are added explicitly by /usr/share/quilt/scripts/patchfns -- grep > for "Index:". I don't know why quilt adds those lines, though. > Trying to resemble cvs output, maybe? Ah, yeah, I turned that off a long time ago in my .quiltrc, here's what I use: QUILT_REFRESH_ARGS="--diffstat --strip-trailing-whitespace --no-timestamps --no-index --sort -p1 -p ab" QUILT_DIFF_ARGS="--no-timestamps --no-index --sort --color=auto -p ab" QUILT_DIFF_OPTS="-p" Anyway, thanks for letting me know, just curious. greg k-h -- 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/