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,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: manual merge of the percpu tree with Linus' tree
Date: Wed, 1 Jul 2009 17:19:25 +1000 [thread overview]
Message-ID: <20090701171925.6db8121d.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 570 bytes --]
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/alpha/include/asm/percpu.h between commit
b01e8dc34379f4ba2f454390e340a025edbaaa7e ("alpha: fix percpu build
breakage") from Linus' tree and commit
6088464cf1ae9fb3d2ccc0ec5feb3f5b971098d8 ("alpha: kill unnecessary __used
attribute in PER_CPU_ATTRIBUTES") from the percpu tree.
The latter just removes what the former changed, so I used the percpu
tree version of this file.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-07-01 7:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-01 7:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-10-30 8:20 linux-next: manual merge of the percpu tree with Linus' tree Stephen Rothwell
2009-10-30 10:02 ` Tejun Heo
2009-10-31 4:23 ` Stephen Rothwell
2009-09-07 8:22 Stephen Rothwell
2009-09-07 8:36 ` Tejun Heo
2009-09-07 10:24 ` Stephen Rothwell
2009-07-01 7:25 Stephen Rothwell
2009-06-29 5:33 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=20090701171925.6db8121d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=cl@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rusty@rustcorp$(echo .)com.au \
--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