From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: Dove: fix build breakage with .timer/.init_time
Date: Sun, 17 Feb 2013 18:23:44 +0000 [thread overview]
Message-ID: <201302171823.44808.arnd@arndb.de> (raw)
In-Reply-To: <1361043816-28753-1-git-send-email-jason@lakedaemon.net>
On Saturday 16 February 2013, Jason Cooper wrote:
> In the latest arm-soc/for-next, building dove_defconfig breaks because
> .timer has been replaced with .init_timer in DT_MACHINE_START. With
> this fix, it builds fine.
When I look at arm-soc/for-next, there is no arch/arm/mach-dove/board-dt.c
file, so it currently builds cleanly and the problem is only when merging
your branch with the arm-soc/timer/cleanup branch.
This is not hard to fix, and there are two ways that work equally well,
just pick one that works for you:
* rebase your branch on top of the arm-soc/timer/cleanup branch and let
us know about the dependency when you send a pull request for it.
* if you don't want to rebase your branch, pull arm-soc/timer/cleanup
into it and do this change in the merge changeset, noting it down
in the changeset description. As above, when you send such a branch,
let us know of the dependency.
If the branch with the merge problem is destined for 3.10, the timer
cleanups will already be in there, so you can simply base on them
now and don't need to track the dependencies.
Arnd
next prev parent reply other threads:[~2013-02-17 18:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-16 19:43 [PATCH] ARM: Dove: fix build breakage with .timer/.init_time Jason Cooper
2013-02-17 18:23 ` Arnd Bergmann [this message]
2013-02-17 23:00 ` Jason Cooper
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=201302171823.44808.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.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).