From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Dirk Brandewie <dirk.j.brandewie@intel•com>
Subject: linux-next: manual merge of the swiotlb-xen tree with the tip tree
Date: Tue, 26 Oct 2010 13:03:32 +1100 [thread overview]
Message-ID: <20101026130332.002937e5.sfr@canb.auug.org.au> (raw)
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{
next reply other threads:[~2010-10-26 2:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-26 2:03 Stephen Rothwell [this message]
2010-10-26 14:47 ` linux-next: manual merge of the swiotlb-xen tree with the tip tree Konrad Rzeszutek Wilk
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=20101026130332.002937e5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dirk.j.brandewie@intel$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jeremy.fitzhardinge@citrix$(echo .)com \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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