From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Roland Dreier <roland@kernel.org>,
linux-rdma@vger.kernel.org, David Miller <davem@davemloft.net>,
<netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Or Gerlitz <ogerlitz@mellanox.com>,
Matan Barak <matanb@mellanox.com>
Subject: linux-next: manual merge of the infiniband tree with the net-next tree
Date: Wed, 15 Jan 2014 13:46:51 +1100 [thread overview]
Message-ID: <20140115134651.5da1a0da6a77891739562279@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1761 bytes --]
Hi all,
Today's linux-next merge of the infiniband tree got a conflict in
include/linux/mlx4/device.h between commit 7ffdf726cfe0 ("net/mlx4_core:
Add basic support for TCP/IP offloads under tunneling") from the net-next
tree and commits 4de658036086 ("mlx4_core: Add support for steerable IB
UD QPs") and dd5f03beb4f7 ("IB/core: Ethernet L2 attributes in verbs/cm
structures") from the infiniband tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/mlx4/device.h
index c99ecf6d2c67,ac5cb1d92487..000000000000
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@@ -166,7 -161,7 +166,8 @@@ enum
MLX4_DEV_CAP_FLAG2_VLAN_CONTROL = 1LL << 6,
MLX4_DEV_CAP_FLAG2_FSM = 1LL << 7,
MLX4_DEV_CAP_FLAG2_UPDATE_QP = 1LL << 8,
- MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS = 1LL << 9
- MLX4_DEV_CAP_FLAG2_DMFS_IPOIB = 1LL << 9
++ MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS = 1LL << 9,
++ MLX4_DEV_CAP_FLAG2_DMFS_IPOIB = 1LL << 10
};
enum {
@@@ -1130,7 -1096,7 +1131,8 @@@ int mlx4_SET_PORT_qpn_calc(struct mlx4_
int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc);
int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,
u8 *pg, u16 *ratelimit);
+int mlx4_SET_PORT_VXLAN(struct mlx4_dev *dev, u8 port, u8 steering);
+ int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx);
int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-01-15 2:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-15 2:46 Stephen Rothwell [this message]
2014-06-02 3:46 Stephen Rothwell
2014-07-16 3:53 Stephen Rothwell
2014-08-04 4:03 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=20140115134651.5da1a0da6a77891739562279@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=matanb@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=roland@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: link
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
all inboxes | Powered by JetHome®