Hi Rusty, Today's linux-next merge of the rr tree got a conflict in drivers/net/sfc/efx.c between commit 3977d0334b98770b81dfeb248db232c9bb3d3c88 ("sfc: modify allocation error message") from Linus' tree and commit c735805e707362aa397ad3e78c16c616b3ec7399 ("cpumask: use zalloc_cpumask_var () where possible") from the rr tree. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc drivers/net/sfc/efx.c index 343e8da,23ee983..0000000 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@@ -884,9 -894,9 +884,9 @@@ static int efx_wanted_rx_queues(void int count; int cpu; - if (unlikely(!alloc_cpumask_var(&core_mask, GFP_KERNEL))) { - if (!zalloc_cpumask_var(&core_mask, GFP_KERNEL)) { ++ if (unlikely(!zalloc_cpumask_var(&core_mask, GFP_KERNEL))) { printk(KERN_WARNING - "efx.c: allocation failure, irq balancing hobbled\n"); + "sfc: RSS disabled due to allocation failure\n"); return 1; } -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html