LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] perf/core: clean up inconsisent indentation
@ 2018-10-29 23:32 Colin King
  2018-10-30  9:00 ` [tip:perf/urgent] perf/core: Clean " tip-bot for Colin Ian King
  2018-10-30 14:44 ` [PATCH] perf/core: clean " Arnaldo Carvalho de Melo
  0 siblings, 2 replies; 5+ messages in thread
From: Colin King @ 2018-10-29 23:32 UTC (permalink / raw)
  To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Alexander Shishkin, Jiri Olsa, Namhyung Kim
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

Replace a bunch of spaces with tab, cleans up indentation

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 8c490130c4fb..84530ab358c3 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -750,7 +750,7 @@ static inline void update_cgrp_time_from_event(struct perf_event *event)
 	/*
 	 * Do not update time when cgroup is not active
 	 */
-       if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
+	if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
 		__update_cgrp_time(event->cgrp);
 }
 
-- 
2.19.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tip:perf/urgent] perf/core: Clean up inconsisent indentation
  2018-10-29 23:32 [PATCH] perf/core: clean up inconsisent indentation Colin King
@ 2018-10-30  9:00 ` tip-bot for Colin Ian King
  2018-10-30 14:44 ` [PATCH] perf/core: clean " Arnaldo Carvalho de Melo
  1 sibling, 0 replies; 5+ messages in thread
From: tip-bot for Colin Ian King @ 2018-10-30  9:00 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, alexander.shishkin, colin.king, peterz, hpa, linux-kernel,
	torvalds, namhyung, mingo, tglx, jolsa

Commit-ID:  28fa741c27e6d57f6bf594ba3c444ce79e671e09
Gitweb:     https://git.kernel.org/tip/28fa741c27e6d57f6bf594ba3c444ce79e671e09
Author:     Colin Ian King <colin.king@canonical.com>
AuthorDate: Mon, 29 Oct 2018 23:32:11 +0000
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 30 Oct 2018 09:51:58 +0100

perf/core: Clean up inconsisent indentation

Replace a bunch of spaces with tab, cleans up indentation

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/20181029233211.21475-1-colin.king@canonical.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 5a97f34bc14c..65e90c752a91 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -750,7 +750,7 @@ static inline void update_cgrp_time_from_event(struct perf_event *event)
 	/*
 	 * Do not update time when cgroup is not active
 	 */
-       if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
+	if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
 		__update_cgrp_time(event->cgrp);
 }
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf/core: clean up inconsisent indentation
  2018-10-29 23:32 [PATCH] perf/core: clean up inconsisent indentation Colin King
  2018-10-30  9:00 ` [tip:perf/urgent] perf/core: Clean " tip-bot for Colin Ian King
@ 2018-10-30 14:44 ` Arnaldo Carvalho de Melo
  2018-10-30 19:25   ` Dan Carpenter
  1 sibling, 1 reply; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2018-10-30 14:44 UTC (permalink / raw)
  To: Colin King
  Cc: Peter Zijlstra, Ingo Molnar, Alexander Shishkin, Jiri Olsa,
	Namhyung Kim, kernel-janitors, linux-kernel

Em Mon, Oct 29, 2018 at 11:32:11PM +0000, Colin King escreveu:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Replace a bunch of spaces with tab, cleans up indentation

I think we can live with the spaces as the 'git blame' information is
more valuable, i.e. who was that touched that line last?

Thanks,

- Arnaldo
 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  kernel/events/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 8c490130c4fb..84530ab358c3 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -750,7 +750,7 @@ static inline void update_cgrp_time_from_event(struct perf_event *event)
>  	/*
>  	 * Do not update time when cgroup is not active
>  	 */
> -       if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
> +	if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
>  		__update_cgrp_time(event->cgrp);
>  }
>  
> -- 
> 2.19.1

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf/core: clean up inconsisent indentation
  2018-10-30 14:44 ` [PATCH] perf/core: clean " Arnaldo Carvalho de Melo
@ 2018-10-30 19:25   ` Dan Carpenter
  2018-10-30 19:34     ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2018-10-30 19:25 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Colin King, Peter Zijlstra, Ingo Molnar, Alexander Shishkin,
	Jiri Olsa, Namhyung Kim, kernel-janitors, linux-kernel

On Tue, Oct 30, 2018 at 11:44:44AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Mon, Oct 29, 2018 at 11:32:11PM +0000, Colin King escreveu:
> > From: Colin Ian King <colin.king@canonical.com>
> > 
> > Replace a bunch of spaces with tab, cleans up indentation
> 
> I think we can live with the spaces as the 'git blame' information is
> more valuable, i.e. who was that touched that line last?
> 

You can use "git blame -w" to ignore white space changes.  I add it
whenever I run blame.

regards,
dan carpenter


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf/core: clean up inconsisent indentation
  2018-10-30 19:25   ` Dan Carpenter
@ 2018-10-30 19:34     ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2018-10-30 19:34 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Colin King, Peter Zijlstra, Ingo Molnar, Alexander Shishkin,
	Jiri Olsa, Namhyung Kim, kernel-janitors, linux-kernel

Em Tue, Oct 30, 2018 at 10:25:31PM +0300, Dan Carpenter escreveu:
> On Tue, Oct 30, 2018 at 11:44:44AM -0300, Arnaldo Carvalho de Melo wrote:
> > Em Mon, Oct 29, 2018 at 11:32:11PM +0000, Colin King escreveu:
> > > From: Colin Ian King <colin.king@canonical.com>

> > > Replace a bunch of spaces with tab, cleans up indentation

> > I think we can live with the spaces as the 'git blame' information is
> > more valuable, i.e. who was that touched that line last?
 
> You can use "git blame -w" to ignore white space changes.  I add it
> whenever I run blame.

Great! I didn't knew that, will try and get this to be the default for
'git blame' in my machines.

Thanks,

- Arnaldo

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2018-10-30 19:34 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-29 23:32 [PATCH] perf/core: clean up inconsisent indentation Colin King
2018-10-30  9:00 ` [tip:perf/urgent] perf/core: Clean " tip-bot for Colin Ian King
2018-10-30 14:44 ` [PATCH] perf/core: clean " Arnaldo Carvalho de Melo
2018-10-30 19:25   ` Dan Carpenter
2018-10-30 19:34     ` Arnaldo Carvalho de Melo

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).