Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755732AbZKWBAm (ORCPT ); Sun, 22 Nov 2009 20:00:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753477AbZKWBAl (ORCPT ); Sun, 22 Nov 2009 20:00:41 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:60255 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753460AbZKWBAk (ORCPT ); Sun, 22 Nov 2009 20:00:40 -0500 Date: Mon, 23 Nov 2009 12:00:43 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Amit Kumar Salecha Subject: linux-next: manual merge of the net tree with the net-current tree Message-Id: <20091123120043.24cf5c12.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.3; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1392 Lines: 36 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@canb.auug.org.au 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/