From: Mike Turquette <mturquette@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Mike Turquette <mturquette@ti.com>
Cc: Prashant Gaikwad <pgaikwad@nvidia.com>,
Stephen Warren <swarren@nvidia.com>,
Arnd Bergmann <arnd@arndb.de>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Mon, 04 Feb 2013 09:54:50 -0800 [thread overview]
Message-ID: <20130204175450.6375.8494@quantum> (raw)
In-Reply-To: <20130202232740.f337dc3a00741a224a4a0e4f@canb.auug.org.au>
Quoting Stephen Rothwell (2013-02-02 04:27:40)
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> include/asm-generic/vmlinux.lds.h between commit ae278a935f08
> ("clocksource: add common of_clksrc_init() function") from the arm-soc
> tree and commit f2f6c2556dcc ("clk: add common of_clk_init() function")
> from the clk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Looks correct to me. Thanks Stephen.
Regards,
Mike
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc include/asm-generic/vmlinux.lds.h
> index fc62ac5,c1fe60a..0000000
> --- a/include/asm-generic/vmlinux.lds.h
> +++ b/include/asm-generic/vmlinux.lds.h
> @@@ -149,25 -149,16 +149,34 @@@
> #define TRACE_SYSCALLS()
> #endif
>
> +#ifdef CONFIG_CLKSRC_OF
> +#define CLKSRC_OF_TABLES() . = ALIGN(8); \
> + VMLINUX_SYMBOL(__clksrc_of_table) = .; \
> + *(__clksrc_of_table) \
> + *(__clksrc_of_table_end)
> +#else
> +#define CLKSRC_OF_TABLES()
> +#endif
> +
> +#ifdef CONFIG_IRQCHIP
> +#define IRQCHIP_OF_MATCH_TABLE() \
> + . = ALIGN(8); \
> + VMLINUX_SYMBOL(__irqchip_begin) = .; \
> + *(__irqchip_of_table) \
> + *(__irqchip_of_end)
> +#else
> +#define IRQCHIP_OF_MATCH_TABLE()
> +#endif
>
> + #ifdef CONFIG_COMMON_CLK
> + #define CLK_OF_TABLES() . = ALIGN(8); \
> + VMLINUX_SYMBOL(__clk_of_table) = .; \
> + *(__clk_of_table) \
> + *(__clk_of_table_end)
> + #else
> + #define CLK_OF_TABLES()
> + #endif
> +
> #define KERNEL_DTB() \
> STRUCT_ALIGN(); \
> VMLINUX_SYMBOL(__dtb_start) = .; \
> @@@ -511,9 -502,8 +520,10 @@@
> DEV_DISCARD(init.rodata) \
> CPU_DISCARD(init.rodata) \
> MEM_DISCARD(init.rodata) \
> + CLKSRC_OF_TABLES() \
> + CLK_OF_TABLES() \
> - KERNEL_DTB()
> + KERNEL_DTB() \
> + IRQCHIP_OF_MATCH_TABLE()
>
> #define INIT_TEXT \
> *(.init.text) \
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2013-02-04 17:54 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-02 12:27 linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell
2013-02-04 17:54 ` Mike Turquette [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-11-22 8:41 Stephen Rothwell
2016-11-22 9:36 ` Geert Uytterhoeven
2016-11-22 23:59 ` Stephen Rothwell
2016-03-01 3:57 Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 8:38 ` Nicolas Ferre
2015-02-03 5:31 Stephen Rothwell
2015-02-03 18:25 ` Mike Turquette
2015-02-03 5:28 Stephen Rothwell
2014-01-13 5:06 Stephen Rothwell
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 21:05 ` Tomasz Figa
2013-06-17 7:27 Stephen Rothwell
2013-06-17 18:49 ` Mike Turquette
2013-04-19 7:27 Stephen Rothwell
2013-04-19 9:47 ` Pawel Moll
2012-11-28 6:12 Stephen Rothwell
2012-10-30 4:06 Stephen Rothwell
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:39 ` Pawel Moll
2012-09-10 6:14 Stephen Rothwell
2012-09-10 15:24 ` Linus Walleij
2012-09-10 16:51 ` Mike Turquette
2012-07-13 5:14 Stephen Rothwell
2012-07-13 15:10 ` Rob Herring
2012-07-13 17:27 ` Mike Turquette
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=20130204175450.6375.8494@quantum \
--to=mturquette@linaro.org \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@ti.com \
--cc=olof@lixom.net \
--cc=pgaikwad@nvidia.com \
--cc=sfr@canb.auug.org.au \
--cc=swarren@nvidia.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).