From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tejun Heo <tj@kernel.org>, Rusty Russell <rusty@rustcorp.com.au>,
Christoph Lameter <cl@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tim Abbott <tabbott@ksplice.com>
Subject: linux-next: manual merge of the percpu tree with the sh tree
Date: Mon, 13 Jul 2009 15:52:28 +1000 [thread overview]
Message-ID: <20090713155228.89bc9a24.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 548 bytes --]
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/sh/kernel/vmlinux.lds.S between commit
2802e34590f290173a3f2aa5a4d662ae5373b420 ("sh: Clean up linker script
using new linker script macros") from the sh tree and commit
023bf6f1b8bf58dc4da7f0dc1cf4787b0d5297c1 ("linker script: unify usage of
discard definition") from the percpu tree.
It looks like the latter is a superset of the former, so I used it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
reply other threads:[~2009-07-13 5:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20090713155228.89bc9a24.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cl@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.au \
--cc=tabbott@ksplice.com \
--cc=tj@kernel.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