linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Grant Likely <grant.likely@secretlab.ca>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Wed, 12 Mar 2014 22:03:50 +0000	[thread overview]
Message-ID: <20140312220350.3c35bce7dff139a73a9c8262@kernel.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2266 bytes --]

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the  tree and commit f618c4703a14672d27 ("drivers: of: add support for custom reserved memory drivers") from the devicetree tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc include/asm-generic/vmlinux.lds.h
index bd02ca7a1d55,f10f64fcc815..000000000000
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -167,15 -167,16 +167,25 @@@
  #define CLK_OF_TABLES()
  #endif
  
 +#ifdef CONFIG_SMP
 +#define CPU_METHOD_OF_TABLES() . = ALIGN(8);                              \
 +                         VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \
 +                         *(__cpu_method_of_table)                         \
 +                         VMLINUX_SYMBOL(__cpu_method_of_table_end) = .;
 +#else
 +#define CPU_METHOD_OF_TABLES()
 +#endif
 +
+ #ifdef CONFIG_OF_RESERVED_MEM
+ #define RESERVEDMEM_OF_TABLES()                               \
+       . = ALIGN(8);                                   \
+       VMLINUX_SYMBOL(__reservedmem_of_table) = .;     \
+       *(__reservedmem_of_table)                       \
+       *(__reservedmem_of_table_end)
+ #else
+ #define RESERVEDMEM_OF_TABLES()
+ #endif
+ 
  #define KERNEL_DTB()                                                  \
        STRUCT_ALIGN();                                                 \
        VMLINUX_SYMBOL(__dtb_start) = .;                                \
@@@ -499,8 -500,8 +509,9 @@@
        TRACE_SYSCALLS()                                                \
        MEM_DISCARD(init.rodata)                                        \
        CLK_OF_TABLES()                                                 \
+       RESERVEDMEM_OF_TABLES()                                         \
        CLKSRC_OF_TABLES()                                              \
 +      CPU_METHOD_OF_TABLES()                                          \
        KERNEL_DTB()                                                    \
        IRQCHIP_OF_MATCH_TABLE()
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2014-03-12 22:03 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-12 22:03 Mark Brown [this message]
2014-03-12 22:36 ` linux-next: manual merge of the devicetree tree with the arm-soc tree Olof Johansson
2014-03-13 12:55   ` Grant Likely
  -- strict thread matches above, loose matches on Subject: below --
2020-05-22  6:03 Stephen Rothwell
2020-05-22  8:08 ` Arnd Bergmann
2019-11-14  2:21 Stephen Rothwell
2019-12-03  0:04 ` Stephen Rothwell
2017-11-09  2:26 Stephen Rothwell
2017-11-09  2:21 Stephen Rothwell
2016-06-27  3:42 Stephen Rothwell
2014-01-17  3:14 Stephen Rothwell
2014-01-17  3:11 Stephen Rothwell
2014-01-17  3:08 Stephen Rothwell
2014-01-17  4:35 ` 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=20140312220350.3c35bce7dff139a73a9c8262@kernel.org \
    --to=broonie@kernel.org \
    --cc=arnd@arndb.de \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=olof@lixom.net \
    --cc=sboyd@codeaurora.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).