From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Catalin Marinas <catalin.marinas@arm•com>,
linux-next@vger•kernel.org, Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>, Sam Ravnborg <sam@ravnborg•org>
Subject: Re: linux-next: manual merge of the kmemleak tree with the x86 tree
Date: Thu, 7 May 2009 11:23:10 +0200 [thread overview]
Message-ID: <20090507092310.GA27707@elte.hu> (raw)
In-Reply-To: <20090507155444.47dd74ea.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Catalin,
>
> Today's linux-next merge of the kmemleak tree got a conflict in
> arch/x86/kernel/vmlinux_32.lds.S arch/x86/kernel/vmlinux_64.lds.S between
> commit 091e52c3551d3031343df24b573b770b4c6c72b6 ("x86, vmlinux.lds: unify
> remaining parts") from the x86 tree and commit
> 31df83f3f517b8ae49ba1f3fe9d5e3dd108a3e37 ("x86: Provide _sdata in the
> vmlinux_*.lds.S files") from the kmemleak tree.
>
> The former commit merges the two files while the latter modifies them.
> I applied the patch below to the merged file. I can carry this as
> necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
> index 4c85b2e..0bbb2d1 100644
> --- a/arch/x86/kernel/vmlinux.lds.S
> +++ b/arch/x86/kernel/vmlinux.lds.S
> @@ -107,6 +107,7 @@ SECTIONS
>
> /* Data */
> . = ALIGN(PAGE_SIZE);
> + _sdata = .; /* Start of data section */
> .data : AT(ADDR(.data) - LOAD_OFFSET) {
> DATA_DATA
> CONSTRUCTORS
At a quick glance, that line should be moved a line further down, to
avoid a boot crash of linux-next with CONFIG_RELOCATABLE=y (which
most distros ship with).
The kmemleak tree change should be submitted to the x86 tree as
well, so we can merge it properly. (it's fine if the kmemleak tree
has that commit too [it obviously needs it] - so there will still be
a conflict - just the resolution will be a straightforward 'pick the
x86 tree side' step.)
Ingo
next prev parent reply other threads:[~2009-05-07 9:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-07 5:54 linux-next: manual merge of the kmemleak tree with the x86 tree Stephen Rothwell
2009-05-07 6:24 ` Sam Ravnborg
2009-05-07 9:23 ` Ingo Molnar [this message]
2009-05-07 10:37 ` Catalin Marinas
2009-05-07 11:13 ` Ingo Molnar
2009-05-07 11:22 ` Stephen Rothwell
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=20090507092310.GA27707@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=catalin.marinas@arm$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sam@ravnborg$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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