From: Mark Brown <broonie@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the tip tree with the pci tree
Date: Wed, 12 Mar 2014 22:18:28 +0000 [thread overview]
Message-ID: <20140312221828.da7bffd214e9749a5652ff22@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1380 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/x86/include/asm/topology.h between commit 25453e9e521382 ("x86/PCI: Remove mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node()") from the pci tree and commit 36fc5500bb1907bea7e ("sched: Remove unused mc_capable() and smt_capable()") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc arch/x86/include/asm/topology.h
index c840571afa4e,9bcc724cafdd..000000000000
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@@ -131,13 -131,19 +131,7 @@@ static inline void arch_fix_phys_packag
}
struct pci_bus;
+int x86_pci_root_bus_node(int bus);
void x86_pci_root_bus_resources(int bus, struct list_head *resources);
- #ifdef CONFIG_SMP
- #define mc_capable() ((boot_cpu_data.x86_max_cores > 1) && \
- (cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids))
- #define smt_capable() (smp_num_siblings > 1)
-#ifdef CONFIG_NUMA
-extern int get_mp_bus_to_node(int busnum);
-extern void set_mp_bus_to_node(int busnum, int node);
-#else
-static inline int get_mp_bus_to_node(int busnum)
-{
- return 0;
-}
-static inline void set_mp_bus_to_node(int busnum, int node)
-{
-}
--#endif
--
#endif /* _ASM_X86_TOPOLOGY_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-12 22:18 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 22:18 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-09 2:47 linux-next: manual merge of the tip tree with the pci tree Stephen Rothwell
2023-10-31 23:15 ` Stephen Rothwell
2022-11-21 4:11 Stephen Rothwell
2020-11-30 4:03 Stephen Rothwell
2020-11-30 10:21 ` Borislav Petkov
2020-11-30 17:40 ` Bjorn Helgaas
2020-10-01 6:38 Stephen Rothwell
2020-10-01 16:06 ` Bjorn Helgaas
2020-09-25 5:35 Stephen Rothwell
2020-10-13 3:34 ` Stephen Rothwell
2020-09-25 5:21 Stephen Rothwell
2020-10-13 3:31 ` Stephen Rothwell
2017-06-28 3:15 Stephen Rothwell
2017-06-29 0:14 ` Christoph Hellwig
2016-12-09 2:38 Stephen Rothwell
2016-12-12 16:09 ` Bjorn Helgaas
2014-11-24 5:18 Stephen Rothwell
2014-11-24 10:51 ` Thomas Gleixner
2014-03-03 6:07 Stephen Rothwell
2014-03-03 6:03 Stephen Rothwell
2014-03-03 9:26 ` Liviu Dudau
2013-10-29 6: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=20140312221828.da7bffd214e9749a5652ff22@kernel.org \
--to=broonie@kernel.org \
--cc=bhelgaas@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--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.