linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Alan Stern <stern@rowland.harvard.edu>
Cc: Tejun Heo <tj@kernel.org>,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Kernel development list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] sysfs: get rid of some lockdep false positives
Date: Mon, 14 May 2012 13:08:59 -0700	[thread overview]
Message-ID: <20120514200859.GA16102@kroah.com> (raw)
In-Reply-To: <Pine.LNX.4.44L0.1205141553290.1699-100000@iolanthe.rowland.org>

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

      reply	other threads:[~2012-05-14 20:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-14 17:30 [PATCH] sysfs: get rid of some lockdep false positives Alan Stern
2012-05-14 19:18 ` Greg KH
2012-05-14 20:03   ` Alan Stern
2012-05-14 20:08     ` Greg KH [this message]

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=20120514200859.GA16102@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=stern@rowland.harvard.edu \
    --cc=tj@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;
as well as URLs for NNTP newsgroup(s).