From: Stephen Rothwell <sfr@canb.auug.org.au> To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Amit Kumar Salecha <amit@netxen.com> Subject: linux-next: manual merge of the net tree with the net-current tree Date: Mon, 23 Nov 2009 12:00:43 +1100 [thread overview] Message-ID: <20091123120043.24cf5c12.sfr@canb.auug.org.au> (raw) 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))
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Amit Kumar Salecha <amit@netxen.com> Subject: linux-next: manual merge of the net tree with the net-current tree Date: Mon, 23 Nov 2009 12:00:43 +1100 [thread overview] Message-ID: <20091123120043.24cf5c12.sfr@canb.auug.org.au> (raw) 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))
next reply other threads:[~2009-11-23 1:00 UTC|newest] Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-11-23 1:00 Stephen Rothwell [this message] 2009-11-23 1:00 ` linux-next: manual merge of the net tree with the net-current tree Stephen Rothwell 2009-11-23 18:09 ` Amit Salecha 2009-11-23 23:17 ` Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2011-09-28 2:54 Stephen Rothwell 2011-09-28 2:54 ` Stephen Rothwell 2011-09-28 5:36 ` David Miller 2011-06-20 2:56 Stephen Rothwell 2011-06-20 2:56 ` Stephen Rothwell 2011-06-20 3:39 ` Simon Horman 2011-06-20 4:26 ` David Miller 2011-05-17 2:01 Stephen Rothwell 2011-05-17 2:01 ` Stephen Rothwell 2011-05-10 1:49 Stephen Rothwell 2011-05-10 1:49 ` Stephen Rothwell 2011-05-10 11:55 ` Sathya.Perla 2011-05-10 11:55 ` Sathya.Perla 2011-05-03 3:15 Stephen Rothwell 2011-05-03 3:15 ` Stephen Rothwell 2011-05-03 3:42 ` David Miller 2011-05-03 4:21 ` Stephen Rothwell 2011-04-19 3:16 Stephen Rothwell 2011-04-19 3:16 ` Stephen Rothwell 2011-04-19 7:41 ` David Miller 2011-04-07 1:39 Stephen Rothwell 2011-04-07 1:39 ` Stephen Rothwell 2011-04-07 20:48 ` David Miller 2011-03-08 3:09 Stephen Rothwell 2011-03-08 3:09 ` Stephen Rothwell 2011-03-08 9:44 ` Dmitry Kravkov 2011-03-09 0:11 ` Stephen Rothwell 2011-03-03 2:40 Stephen Rothwell 2011-03-03 2:40 ` Stephen Rothwell 2011-02-18 1:20 Stephen Rothwell 2011-02-18 1:20 ` Stephen Rothwell 2011-02-09 0:56 Stephen Rothwell 2011-02-09 0:56 ` Stephen Rothwell 2011-02-09 1:06 ` David Miller 2010-12-15 0:45 Stephen Rothwell 2010-12-15 0:45 ` Stephen Rothwell 2010-11-19 0:17 Stephen Rothwell 2010-11-19 0:17 ` Stephen Rothwell 2010-11-19 21:14 ` David Miller 2010-11-19 0:17 Stephen Rothwell 2010-11-19 0:17 ` Stephen Rothwell 2010-11-19 21:11 ` David Miller 2010-10-07 1:31 Stephen Rothwell 2010-10-07 1:31 ` Stephen Rothwell 2010-10-07 2:35 ` David Miller 2010-10-01 2:48 Stephen Rothwell 2010-10-01 2:48 ` Stephen Rothwell 2010-10-01 2:48 Stephen Rothwell 2010-10-01 2:48 ` Stephen Rothwell 2010-10-01 3:27 ` Jerry Chu 2010-10-05 5:47 ` David Miller 2010-09-23 2:14 Stephen Rothwell 2010-09-23 2:14 ` Stephen Rothwell 2010-08-02 1:04 Stephen Rothwell 2010-08-02 1:04 ` Stephen Rothwell 2010-08-02 1:04 ` Stephen Rothwell 2010-07-29 1:19 Stephen Rothwell 2010-07-29 1:19 ` Stephen Rothwell 2010-07-29 1:26 ` Jeff Kirsher 2010-07-29 1:26 ` Jeff Kirsher 2010-07-29 1:05 Stephen Rothwell 2010-07-29 1:05 ` Stephen Rothwell 2010-07-29 5:51 ` Jiri Pirko 2010-07-20 2:20 Stephen Rothwell 2010-07-20 2:20 ` Stephen Rothwell 2010-07-20 2:34 ` Joe Perches 2010-07-21 1:27 ` David Miller 2010-06-23 2:51 Stephen Rothwell 2010-06-23 2:51 ` Stephen Rothwell 2010-06-23 2:51 ` Stephen Rothwell 2010-06-23 4:14 ` Herbert Xu 2010-06-23 4:14 ` Herbert Xu 2010-06-25 18:22 ` David Miller 2010-06-25 18:22 ` David Miller 2010-06-15 2:00 Stephen Rothwell 2010-06-15 2:00 ` Stephen Rothwell 2009-11-24 3:11 Stephen Rothwell 2009-11-24 3:11 ` Stephen Rothwell 2009-11-30 1:12 ` David Miller 2009-11-24 3:11 Stephen Rothwell 2009-11-24 3:11 ` Stephen Rothwell 2009-11-25 7:52 ` Jeff Kirsher 2009-11-25 7:52 ` Jeff Kirsher 2009-11-30 1:11 ` David Miller 2009-11-30 2:46 ` Stephen Rothwell 2009-11-23 1:00 Stephen Rothwell 2009-11-23 1:00 ` Stephen Rothwell 2009-11-23 1:19 ` David Miller 2009-11-23 2:04 ` Stephen Rothwell 2009-11-23 2:11 ` David Miller 2009-11-17 2:16 Stephen Rothwell 2009-11-17 2:16 ` Stephen Rothwell 2009-11-17 8:00 ` Oliver Hartkopp 2009-11-17 8:16 ` Stephen Rothwell 2009-11-17 8:07 ` David Miller 2009-11-17 8:10 ` Stephen Rothwell 2009-11-09 2:03 Stephen Rothwell 2009-11-09 2:03 ` Stephen Rothwell 2009-11-09 4:59 ` David Miller 2009-11-06 0:55 Stephen Rothwell 2009-11-06 0:55 ` Stephen Rothwell 2009-11-06 1:40 ` David Miller 2009-11-06 2:32 ` Stephen Rothwell 2009-08-14 2:40 Stephen Rothwell 2009-08-14 2:50 ` David Miller 2009-08-14 4:19 ` Stephen Rothwell 2009-08-14 5:27 ` Dhananjay Phadke 2009-03-16 5:05 Stephen Rothwell 2009-03-16 6:41 ` Kirsher, Jeffrey T 2009-03-16 8:19 ` Stephen Rothwell 2009-02-12 2:46 Stephen Rothwell 2009-02-15 7:12 ` David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20091123120043.24cf5c12.sfr@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=amit@netxen.com \ --cc=davem@davemloft.net \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.