[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.44L0.1205141553290.1699-100000@iolanthe.rowland.org>
Date: Mon, 14 May 2012 16:03:59 -0400 (EDT)
From: Alan Stern <stern@...land.harvard.edu>
To: Greg KH <gregkh@...uxfoundation.org>
cc: Tejun Heo <tj@...nel.org>,
"Eric W. Biederman" <ebiederm@...ssion.com>,
Peter Zijlstra <peterz@...radead.org>,
Kernel development list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] sysfs: get rid of some lockdep false positives
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?
Alan Stern
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists