linux-next: manual merge of the xen-tip tree with the tip tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jeremy Fitzhardinge <jeremy@goop.org>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	Xen Devel <Xen-devel@lists.xensource.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,
	Roger Pau Monne <roger.pau@citrix.com>,
	David Vrabel <david.vrabel@citrix.com>
Subject: linux-next: manual merge of the xen-tip tree with the tip tree
Date: Thu, 20 Mar 2014 15:15:30 +1100	[thread overview]
Message-ID: <20140320151530.e919b8d4c0d9cf701a2c5163@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

Hi all,

Today's linux-next merge of the xen-tip tree got a conflict in
drivers/xen/events/events_base.c between commit 02893afdd310 ("xen: Get
rid of the last irq_desc abuse") from the tip tree and commit
8fb980538510 ("xen: add support for MSI message groups") from the xen-tip
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/xen/events/events_base.c
index c3458f58de90,793053065629..000000000000

--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@@ -767,7 -788,16 +776,12 @@@ int xen_destroy_irq(int irq
  
  	mutex_lock(&irq_mapping_update_lock);
  
- 	if (xen_initial_domain()) {
 -	desc = irq_to_desc(irq);
 -	if (!desc)
 -		goto out;
 -
+ 	/*
+ 	 * If trying to remove a vector in a MSI group different
+ 	 * than the first one skip the PIRQ unmap unless this vector
+ 	 * is the first one in the group.
+ 	 */
+ 	if (xen_initial_domain() && !(info->u.pirq.flags & PIRQ_MSI_GROUP)) {
  		unmap_irq.pirq = info->u.pirq.pirq;
  		unmap_irq.domid = info->u.pirq.domid;
  		rc = HYPERVISOR_physdev_op(PHYSDEVOP_unmap_pirq, &unmap_irq);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
