From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>, Roland Dreier <rolandd@cisco•com>
Cc: linux-next@vger•kernel.org, Faisal Latif <faisal.latif@intel•com>,
Stephen Hemminger <shemminger@vyatta•com>
Subject: linux-next: manual merge of the net tree with the infiniband tree
Date: Tue, 24 Mar 2009 13:31:47 +1100 [thread overview]
Message-ID: <20090324133147.d73c2987.sfr@canb.auug.org.au> (raw)
Hi Dave, Roland,
Today's linux-next merge of the net tree got a conflict in
drivers/infiniband/hw/nes/nes_nic.c between commit
2869975cfbd58dc6591d8c3ba1f171e7f758be28 ("RDMA/nes: Remove LLTX") from
the infiniband tree and commit d0929553bebcac828b612e7d6d239559e08feaf4
("infiniband: convert nes driver to net_device_ops") from the net tree.
Just a trivial context change (the commits deleted lines next to each
other). I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/infiniband/hw/nes/nes_nic.c
index 025ed9f,ae8c688..0000000
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@@ -1598,9 -1618,10 +1601,9 @@@ struct net_device *nes_netdev_init(stru
netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");
netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
- netdev->vlan_rx_register = nes_netdev_vlan_rx_register;
- netdev->features |= NETIF_F_LLTX;
/* Fill in the port structure */
+ nesvnic = netdev_priv(netdev);
nesvnic->netdev = netdev;
nesvnic->nesdev = nesdev;
nesvnic->msg_enable = netif_msg_init(debug, default_msg);
next reply other threads:[~2009-03-24 2:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-24 2:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-03-26 3:27 linux-next: manual merge of the net tree with the infiniband tree Stephen Rothwell
2009-03-23 3:50 Stephen Rothwell
2009-03-23 4:17 ` David Miller
2009-03-23 16:36 ` Roland Dreier
2009-03-23 16:42 ` Stephen Hemminger
2009-03-23 19:28 ` David Miller
2009-03-23 3:49 Stephen Rothwell
2009-03-23 3:49 Stephen Rothwell
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=20090324133147.d73c2987.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=faisal.latif@intel$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rolandd@cisco$(echo .)com \
--cc=shemminger@vyatta$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox