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 sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpiZpu7gA5X8.pgp
Description: PGP signature
