[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20090616130632.3c411f5c.sfr@canb.auug.org.au>
Date: Tue, 16 Jun 2009 13:06:32 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Rusty Russell <rusty@...tcorp.com.au>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Mike Travis <travis@....com>,
"David S. Miller" <davem@...emloft.net>,
Li Zefan <lizf@...fujitsu.com>
Subject: linux-next: manual merge of the rr tree with the tree
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@...b.auug.org.au
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists