From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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: Re: linux-next: manual merge of the xen-two tree with the tip tree
Date: Tue, 15 Mar 2011 09:50:04 -0400 [thread overview]
Message-ID: <20110315135004.GB3432@dumpdata.com> (raw)
In-Reply-To: <20110315172833.4fd17a0c.sfr@canb.auug.org.au>
On Tue, Mar 15, 2011 at 05:28:33PM +1100, Stephen Rothwell wrote:
> 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).
Looks good. Thank you for following the trail down the patch changes.
> --
> 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
next prev parent reply other threads:[~2011-03-15 13:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-15 6:28 linux-next: manual merge of the xen-two tree with the tip tree Stephen Rothwell
2011-03-15 13:50 ` Konrad Rzeszutek Wilk [this message]
-- 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=20110315135004.GB3432@dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=hpa@zytor.com \
--cc=ian.campbell@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--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.