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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 10 Feb 2011 14:55:28 +1100

Hi Konrad,

Today's linux-next merge of the xen-two tree got a conflict in
kernel/irq/manage.c between commit
dc5f219e88294b93009eef946251251ffffb6d60 ("genirq: Add
IRQF_FORCE_RESUME") from the tip tree and commit
c6c5596743c2a333a8e31b0247f44cd367484a5e ("genirq: Add
IRQF_FORCE_RESUME") from the xen-two tree.

Despite having the same Author time stamps, these commits are not quite the
same.  I used the version from the tip tree which kept the line:

		desc->status &= ~IRQ_SUSPENDED;

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/