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@xxxxxxxxxxxxxxxx
Attachment:
pgpueh9xP89q4.pgp
Description: PGP signature
