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,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Ian Campbell <ian.campbell@citrix•com>
Subject: linux-next: manual merge of the xen-two tree with the tip tree
Date: Tue, 15 Mar 2011 17:28:33 +1100 [thread overview]
Message-ID: <20110315172833.4fd17a0c.sfr@canb.auug.org.au> (raw)
Hi Konrad,
Today's linux-next merge of the xen-two tree got a conflict in
arch/x86/pci/xen.c between commit 2c778651f73d ("x86: Cleanup the genirq
name space") from the tip tree and commit bf480d952bcf ("xen: events:
separate MSI PIRQ allocation from PIRQ binding to IRQ") from the xen-two
tree. Commit f420e010edd8 ("xen: events: push set_irq_msi down into
xen_create_msi_irq") then moved the code modified by the tip tree commit
into drivers/xen/events.c.
I fixed it up (I think - see below) and can carry the fix as necessary (I
used the xen-two tree's version of arch/x86/pci/xen.c).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 62e5237..934a3b1 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -692,7 +692,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
handle_level_irq, name);
xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, 0);
- ret = set_irq_msi(irq, msidesc);
+ ret = irq_set_msi_desc(irq, msidesc);
if (ret < 0)
goto error_irq;
out:
--
1.7.4.1
next reply other threads:[~2011-03-15 6:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-15 6:28 Stephen Rothwell [this message]
2011-03-15 13:50 ` linux-next: manual merge of the xen-two tree with the tip tree Konrad Rzeszutek Wilk
-- strict thread matches above, loose matches on Subject: below --
2013-07-03 5:59 Stephen Rothwell
2013-07-03 11:36 ` Konrad Rzeszutek Wilk
2011-02-10 3:55 Stephen Rothwell
2011-02-10 12:22 ` Thomas Gleixner
2011-02-10 12:24 ` Ingo Molnar
2011-02-10 15:24 ` 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=20110315172833.4fd17a0c.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=ian.campbell@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