From: Frederic Weisbecker <fweisbec@gmail.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
LKML <linux-kernel@vger.kernel.org>,
Archs <linux-arch@vger.kernel.org>,
Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PATCH 6/6] arch: Remove stub cputime.h headers
Date: Wed, 12 Mar 2014 16:47:17 +0100 [thread overview]
Message-ID: <20140312154715.GB12280@localhost.localdomain> (raw)
In-Reply-To: <20140312152644.GF27965@twins.programming.kicks-ass.net>
On Wed, Mar 12, 2014 at 04:26:44PM +0100, Peter Zijlstra wrote:
> On Wed, Mar 12, 2014 at 04:23:28PM +0100, Frederic Weisbecker wrote:
> > On Wed, Mar 12, 2014 at 10:44:47AM +0100, Peter Zijlstra wrote:
> > > On Wed, Mar 12, 2014 at 03:10:02AM +0100, Frederic Weisbecker wrote:
> > > > diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
> > > > index a73a8e2..1a81a8b 100644
> > > > --- a/arch/alpha/include/asm/Kbuild
> > > > +++ b/arch/alpha/include/asm/Kbuild
> > > > @@ -5,3 +5,4 @@ generic-y += exec.h
> > > > generic-y += trace_clock.h
> > > > generic-y += preempt.h
> > > > generic-y += hash.h
> > > > +generic-y += cputime.h
> > > > \ No newline at end of file
> > >
> > > That's a double fail there, not sorted and no EOL.
> > >
> > > Please run the script from commit: b119fa61d440f after you touch the
> > > asm/Kbuild files.
> >
> > I don't see why we need to sort them. But I'm running the script anyway.
> > Will resend, thanks.
>
> sfr gets real grumpy if we don't, at one point I gave in and wrote that
> script, because I sure as hell wasn't going to manually sort all those
> files every time I did a automated addition.
I see, it's to avoid merge conflicts then. Granted.
next prev parent reply other threads:[~2014-03-12 15:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 2:09 [GIT PULL] timers updates for 3.15 Frederic Weisbecker
2014-03-12 2:09 ` Frederic Weisbecker
2014-03-12 2:10 ` [PATCH 6/6] arch: Remove stub cputime.h headers Frederic Weisbecker
2014-03-12 2:10 ` Frederic Weisbecker
2014-03-12 9:44 ` Peter Zijlstra
2014-03-12 9:44 ` Peter Zijlstra
2014-03-12 15:23 ` Frederic Weisbecker
2014-03-12 15:26 ` Peter Zijlstra
2014-03-12 15:47 ` Frederic Weisbecker [this message]
2014-03-12 16:23 ` [PATCH v2] " Frederic Weisbecker
-- strict thread matches above, loose matches on Subject: below --
2014-03-06 17:56 [PATCH 0/6] cputime: Fixes and cleanups on steal time accounting Frederic Weisbecker
2014-03-06 17:56 ` [PATCH 6/6] arch: Remove stub cputime.h headers Frederic Weisbecker
2014-03-06 17:56 ` Frederic Weisbecker
2014-03-06 19:40 ` Rik van Riel
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=20140312154715.GB12280@localhost.localdomain \
--to=fweisbec@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mtosatti@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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).