From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Chris Metcalf <cmetcalf@tilera•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tejun Heo <tj@kernel•org>
Subject: linux-next: manual merge of the tile tree with Linus' tree
Date: Fri, 18 Mar 2011 10:34:44 +1100 [thread overview]
Message-ID: <20110318103444.f3ff064e.sfr@canb.auug.org.au> (raw)
Hi Chris,
Today's linux-next merge of the tile tree got a conflict in
arch/tile/kernel/vmlinux.lds.S between commit 19df0c2fef01 ("percpu:
align percpu readmostly subsection to cacheline") from Linus' tree and
commit 2cb82400719e ("arch/tile: catch up with section naming convention
in 2.6.35") from the tile tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/tile/kernel/vmlinux.lds.S
index c6ce378,4e211c1..0000000
--- a/arch/tile/kernel/vmlinux.lds.S
+++ b/arch/tile/kernel/vmlinux.lds.S
@@@ -59,11 -59,8 +59,8 @@@ SECTION
. = ALIGN(PAGE_SIZE);
VMLINUX_SYMBOL(_sinitdata) = .;
- .init.page : AT (ADDR(.init.page) - LOAD_OFFSET) {
- *(.init.page)
- } :data =0
- INIT_DATA_SECTION(16)
+ INIT_DATA_SECTION(16) :data =0
- PERCPU(PAGE_SIZE)
+ PERCPU(L2_CACHE_BYTES, PAGE_SIZE)
. = ALIGN(PAGE_SIZE);
VMLINUX_SYMBOL(_einitdata) = .;
next reply other threads:[~2011-03-17 23:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-17 23:34 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-14 0:10 linux-next: manual merge of the tile tree with Linus' tree Stephen Rothwell
2012-03-14 0:56 ` Chris Metcalf
2012-04-02 0:37 Stephen Rothwell
2012-04-02 0:46 Stephen Rothwell
2012-04-10 0:34 Stephen Rothwell
2012-04-10 0:38 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=20110318103444.f3ff064e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cmetcalf@tilera$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tj@kernel$(echo .)org \
/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