public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Peter Anvin <hpa@zytor.com>, Thomas Gleixner <tglx@linutronix.de>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-tip-commits@vger.kernel.org
Subject: Re: [tip:perf/urgent] perf/core: Fix lock inversion between perf,trace,cpuhp
Date: Wed, 24 Jan 2018 12:42:42 -0500	[thread overview]
Message-ID: <20180124124242.5037d0ac@vmware.local.home> (raw)
In-Reply-To: <CA+55aFyq=NbiYrbYst34iRU9M7-hA5UNMKJ9aAcS+ADs7bBhQA@mail.gmail.com>

On Wed, 24 Jan 2018 08:57:10 -0800
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> Maybe git should have used a different comment scheme, but I have to
> admit that I think this is the first time I've heard of this issue
> causing problems in practice. I'm sure it's triggered before, and
> nobody has noticed (or I wasn't on the cc).

It does happen a bit in practice. It's nailed me a few times. I just
consider it as the way git works and didn't complain.
 
> 
> So the '#' thing _normally_ works, but yes, it can cause issues.

I just brought this up here:

 http://lkml.kernel.org/r/20180112121148.20778932@gandalf.local.home

And someone replied with a pointer to:

 https://github.com/git/git/blob/master/Documentation/RelNotes/2.0.0.txt

suggesting 

   git config commit.cleanup scissors

Where git looks for:

 # ------------------------ >8 ------------------------

and does not delete comments before it. But this could play havoc when
doing squash though.

-- Steve

      reply	other threads:[~2018-01-24 17:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <tip-25695067c32e34047b5490436a90af507fda1c2e@git.kernel.org>
2018-01-24 11:36 ` [tip:perf/urgent] perf/core: Fix lock inversion between perf,trace,cpuhp Peter Zijlstra
2018-01-24 15:32   ` Ingo Molnar
2018-01-24 16:57     ` Linus Torvalds
2018-01-24 17:42       ` Steven Rostedt [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=20180124124242.5037d0ac@vmware.local.home \
    --to=rostedt@goodmis.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.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