linux-next: manual merge of the timers tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the timers tree got a conflict in
kernel/irq/chip.c between commit 0c5d1eb77a8be917b638344a22afe1398236482b
("genirq: record trigger type") from Linus' tree and commit
f2f61d198649e25e4ddce33f716729eae1aab02b ("generic: sparse irqs: use
irq_desc() together with dyn_array, instead of irq_desc[]") from the
timers tree.

I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

diff --cc kernel/irq/chip.c
index 5203a59,5a3f73e..0000000
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@@ -126,13 -128,11 +128,12 @@@ int set_irq_type(unsigned int irq, unsi
  		return -ENODEV;
  	}
  
- 	desc = irq_desc + irq;
 -	if (desc->chip->set_type) {
 -		spin_lock_irqsave(&desc->lock, flags);
 -		ret = desc->chip->set_type(irq, type);
 -		spin_unlock_irqrestore(&desc->lock, flags);
 -	}
 +	if (type == IRQ_TYPE_NONE)
 +		return 0;
 +
 +	spin_lock_irqsave(&desc->lock, flags);
 +	ret = __irq_set_trigger(desc, irq, flags);
 +	spin_unlock_irqrestore(&desc->lock, flags);
  	return ret;
  }
  EXPORT_SYMBOL(set_irq_type);

Attachment: pgpaAnoQEc0oS.pgp
Description: PGP signature