Hi all, Today's linux-next merge of the net tree got a conflict in drivers/net/netxen/netxen_nic_init.c between commit 5d521fd36de4e61ab16a358df54c5babe153396c ("netxen: fix memory initialization") from the net-current tree and commit 0be367bd5d10634c0836f57a684432fee935d929 ("netxen: reset sequence changes") from the net tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc drivers/net/netxen/netxen_nic_init.c index 8a09043,6ee27a6..0000000 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@@ -544,9 -528,8 +528,10 @@@ int netxen_pinit_from_rom(struct netxen continue; if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */ continue; + if ((off & 0x0ff00000) == NETXEN_CRB_DDR_NET) + continue; - if (off == (NETXEN_CRB_PEG_NET_1 + 0x18)) + if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) && + !NX_IS_REVISION_P3P(adapter->ahw.revision_id)) buf[i].data = 0x1020; /* skip the function enable register */ if (off == NETXEN_PCIE_REG(PCIE_SETUP_FUNCTION)) -- 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