$ 0 0 Hi Greg, Today's linux-next merge of the staging tree got a conflict in: include/linux/irqdomain.h between commit: 29d5c8db26ad ("genirq: Add