* linux-next: manual merge of the swiotlb-xen tree with the tip tree
@ 2010-10-26 2:03 Stephen Rothwell
2010-10-26 14:47 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-10-26 2:03 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: linux-next, linux-kernel, Jeremy Fitzhardinge, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra, Dirk Brandewie
Hi Konrad,
Today's linux-next merge of the swiotlb-xen tree got a conflict in
arch/x86/include/asm/io_apic.h between commit
23f9b267159b4c7ff59d2e6c8ed31693eff841e3 ("x86: apic: Move
probe_nr_irqs_gsi() into ioapic_init_mappings()") from the tip tree and
commit 7b586d71858091f0958e5808b7e3d5390c2ae47d ("x86/io_apic: add
get_nr_irqs_gsi()") from the swiotlb-xen 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/x86/include/asm/io_apic.h
index 240a0a5,a6b28d0..0000000
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@@ -168,6 -168,9 +168,8 @@@ extern int save_IO_APIC_setup(struct IO
extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
-extern void probe_nr_irqs_gsi(void);
+ extern int get_nr_irqs_gsi(void);
+
extern void setup_ioapic_ids_from_mpc(void);
struct mp_ioapic_gsi{
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the swiotlb-xen tree with the tip tree
2010-10-26 2:03 linux-next: manual merge of the swiotlb-xen tree with the tip tree Stephen Rothwell
@ 2010-10-26 14:47 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 2+ messages in thread
From: Konrad Rzeszutek Wilk @ 2010-10-26 14:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Jeremy Fitzhardinge, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra, Dirk Brandewie
On Tue, Oct 26, 2010 at 01:03:32PM +1100, Stephen Rothwell wrote:
> Hi Konrad,
>
> Today's linux-next merge of the swiotlb-xen tree got a conflict in
> arch/x86/include/asm/io_apic.h between commit
> 23f9b267159b4c7ff59d2e6c8ed31693eff841e3 ("x86: apic: Move
> probe_nr_irqs_gsi() into ioapic_init_mappings()") from the tip tree and
> commit 7b586d71858091f0958e5808b7e3d5390c2ae47d ("x86/io_apic: add
> get_nr_irqs_gsi()") from the swiotlb-xen tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-26 14:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-26 2:03 linux-next: manual merge of the swiotlb-xen tree with the tip tree Stephen Rothwell
2010-10-26 14:47 ` Konrad Rzeszutek Wilk
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.