Re: linux-next: manual merge of the irqdomain tree with the tree

2013-06-18 Thread Grant Likely
On Tue, Jun 18, 2013 at 6:45 AM, Stephen Rothwell wrote: > Hi Grant, > > Today's linux-next merge of the irqdomain tree got a conflict in > kernel/irq/irqdomain.c between commit c5cdc67a58a2 ("irqdomain: Remove > temporary MIPS workaround code") from the mips tree and commit > bd4641e31e90 ("irq:

linux-next: manual merge of the irqdomain tree with the tree

2013-06-17 Thread Stephen Rothwell
Hi Grant, Today's linux-next merge of the irqdomain tree got a conflict in kernel/irq/irqdomain.c between commit c5cdc67a58a2 ("irqdomain: Remove temporary MIPS workaround code") from the mips tree and commit bd4641e31e90 ("irq: fix checkpatch error") from the irqdomain tree. I fixed it up (see b