From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Borislav Petkov <borislav.petkov@amd•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Rusty Russell <rusty@rustcorp•com.au>,
Andreas Herrmann <andreas.herrmann3@amd•com>
Subject: linux-next: manual merge of the edac-amd tree with the rr tree
Date: Thu, 30 Jul 2009 15:41:50 +1000 [thread overview]
Message-ID: <20090730154150.d4c326b5.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
Hi Borislav,
Today's linux-next merge of the edac-amd tree got a conflict in
include/linux/topology.h between commit
11c0109a8c24b27fd6eff8c2c0ddca598675212d
("cpumask:remove-topology_core_siblings-and-topology_thread_siblings-core")
from the rr tree and commit 86aebc88b40884510c914ad71e81c8536a15052e
("topology: introduce cpu_node information for multi-node processors")
from the edac-amd tree.
The latter adds topology_cpu_node_siblings() which is not needed (the
former makes it clear that the _cpumask versions of these should be used
instead). I fixed it up and can carry the fix as necessary.
--
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-30 5:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-30 5:41 Stephen Rothwell [this message]
2009-07-30 6:23 ` linux-next: manual merge of the edac-amd tree with the rr tree Borislav Petkov
2009-07-30 7:08 ` Stephen Rothwell
2009-07-30 11:09 ` Borislav Petkov
2009-07-31 2:01 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-08-06 7:51 Stephen Rothwell
2009-08-06 8:07 ` Borislav Petkov
2009-11-19 5:23 Stephen Rothwell
2009-11-19 6:06 ` Borislav Petkov
2009-11-19 6:56 ` Rusty Russell
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=20090730154150.d4c326b5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andreas.herrmann3@amd$(echo .)com \
--cc=borislav.petkov@amd$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rusty@rustcorp$(echo .)com.au \
/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