linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Stultz <john.stultz@linaro.org>
To: Stephen Boyd <sboyd@codeaurora.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org,
	Russell King <linux@arm.linux.org.uk>,
	linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
	Will Deacon <will.deacon@arm.com>,
	arm@kernel.org, Catalin Marinas <catalin.marinas@arm.com>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCHv2 3/6] sched_clock: Make ARM's sched_clock generic for all architectures
Date: Mon, 24 Jun 2013 15:54:52 -0700	[thread overview]
Message-ID: <51C8CE3C.2030406@linaro.org> (raw)
In-Reply-To: <51C8CC20.3010700@codeaurora.org>

On 06/24/2013 03:45 PM, Stephen Boyd wrote:
> On 06/21/13 10:42, John Stultz wrote:
>> On 06/21/2013 10:05 AM, Stephen Boyd wrote:
>>> On 06/21, Arnd Bergmann wrote:
>>>> This causes build failures when doing a simple merge with the arm-soc
>>>> tree:
>>>>
>>>> ==> build/clps711x_defconfig/faillog <==
>>>> /git/arm-soc/arch/arm/mach-clps711x/common.c:37:29: fatal error:
>>>> asm/sched_clock.h: No such file or directory
>>>>    #include <asm/sched_clock.h>
>>>>                                ^
>>>> ==> build/imx_v6_v7_defconfig/faillog <==
>>>> /git/arm-soc/drivers/clocksource/vf_pit_timer.c:15:29: fatal error:
>>>> asm/sched_clock.h: No such file or directory
>>>>    #include <asm/sched_clock.h>
>>>>
>>>> How about adding back a temporary arch/arm/include/asm/sched_clock.h
>>>> that only contains "#include <linux/sched_clock.h>" so we can change
>>>> those two files after the merge and still get a bisectible history?
>>>>
>>> Sounds fine. John can you add this patch on top?
>> Thanks. I've queued this and will send it on to Thomas here shortly.
> Thanks John. Can you send this off to the tip tree? I think we'll need
> to merge tip/timers into arm-soc so I can send the rest of my "kill ARM
> local timer API" series through and this patch helps make that more
> palatable.

Thanks for the reminder! Just sent the pull request.

thanks
-john

  reply	other threads:[~2013-06-24 22:54 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-02  6:39 [PATCHv2 0/6] Make ARM's sched_clock generic + 64 bit friendly Stephen Boyd
2013-06-02  6:39 ` [PATCHv2 1/6] ARM: sched_clock: Remove unused needs_suspend member Stephen Boyd
2013-06-02  6:39 ` [PATCHv2 2/6] ARM: sched_clock: Return suspended count earlier Stephen Boyd
2013-06-02  6:39 ` [PATCHv2 3/6] sched_clock: Make ARM's sched_clock generic for all architectures Stephen Boyd
2013-06-03  7:12   ` Baruch Siach
2013-06-03 19:50     ` Stephen Boyd
2013-06-04 17:56       ` John Stultz
2013-06-04 18:16         ` Russell King - ARM Linux
2013-06-21 15:45   ` Arnd Bergmann
2013-06-21 17:05     ` Stephen Boyd
2013-06-21 17:42       ` John Stultz
2013-06-24 22:45         ` Stephen Boyd
2013-06-24 22:54           ` John Stultz [this message]
2013-06-02  6:39 ` [PATCHv2 4/6] sched_clock: Add support for >32 bit sched_clock Stephen Boyd
2013-06-03  9:39   ` Russell King - ARM Linux
2013-06-03 21:11     ` Stephen Boyd
2013-06-03 22:12       ` Russell King - ARM Linux
2013-06-04  1:51         ` Stephen Boyd
2013-06-04 10:21           ` Russell King - ARM Linux
2013-06-10  4:12             ` Rob Herring
2013-06-14 17:17               ` Catalin Marinas
2013-06-10 15:16         ` anish singh
2013-06-10 15:38           ` Russell King - ARM Linux
2013-06-10 16:01             ` anish singh
2013-06-10 16:08               ` Russell King - ARM Linux
2013-06-02  6:39 ` [PATCHv2 5/6] ARM: arch_timer: Move to setup_sched_clock_64() Stephen Boyd
2013-06-02  6:39 ` [PATCHv2 6/6] arm64: Move to generic sched_clock infrastructure Stephen Boyd
2013-06-03  8:52 ` [PATCHv2 0/6] Make ARM's sched_clock generic + 64 bit friendly Baruch Siach
2013-06-04  0:19 ` John Stultz
2013-06-04 16:09   ` Will Deacon
2013-06-04 17:53     ` John Stultz
2013-06-16  9:45       ` Baruch Siach
2013-06-17 16:23         ` John Stultz
2013-06-17 18:02           ` Baruch Siach
2013-06-17 18:14             ` John Stultz

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=51C8CE3C.2030406@linaro.org \
    --to=john.stultz@linaro.org \
    --cc=arm@kernel.org \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=sboyd@codeaurora.org \
    --cc=tglx@linutronix.de \
    --cc=will.deacon@arm.com \
    /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).