24 May 2012 07:54
linux-next: manual merge of the signal tree with Linus' tree
Stephen Rothwell <sfr <at> canb.auug.org.au>
2012-05-24 05:54:53 GMT
2012-05-24 05:54:53 GMT
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
kernel/irq/manage.c between commit f5d89470f91f ("genirq: Be more
informative on irq type mismatch") from Linus' tree and commit
501a0effacfa ("genirq: reimplement exit_irq_thread() hook via
task_work_add()") from the signal tree.
The latter removed the code modified by the former, so I did that.
--
--
Cheers,
Stephen Rothwell sfr <at> canb.auug.org.au
RSS Feed