From: Ingo Molnar <mingo@elte.hu>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
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 13:13:06 +0200 [thread overview]
Message-ID: <20090507111306.GG28398@elte.hu> (raw)
In-Reply-To: <1241692671.6648.12.camel@pc1117.cambridge.arm.com>
* Catalin Marinas <catalin.marinas@arm.com> wrote:
> > (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.)
>
> There may not be a conflict if the changes are identical (but it
> depends on what else is in the x86 tree).
They will conflict, because the x86 tree has these changes in that
area:
arch/x86/kernel/vmlinux.lds.S | 430 ++++++++++-
arch/x86/kernel/vmlinux_32.lds.S | 229 ------
arch/x86/kernel/vmlinux_64.lds.S | 298 -------
spread out in 15 commits.
Ingo
next prev parent reply other threads:[~2009-05-07 11:13 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
2009-05-07 10:37 ` Catalin Marinas
2009-05-07 11:13 ` Ingo Molnar [this message]
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=20090507111306.GG28398@elte.hu \
--to=mingo@elte.hu \
--cc=catalin.marinas@arm.com \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.