* linux-next: manual merge of the infiniband tree with Linus' tree
@ 2013-02-26 0:45 Stephen Rothwell
2013-02-26 7:27 ` Or Gerlitz
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-02-26 0:45 UTC (permalink / raw)
To: Roland Dreier, linux-rdma-u79uwXL29TY76Z2rM5mHXA
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Hadar Hen Zion, David Miller,
netdev-u79uwXL29TY76Z2rM5mHXA, Shani Michaeli, Haggai Eran,
Or Gerlitz
[-- Attachment #1: Type: text/plain, Size: 1052 bytes --]
Hi all,
Today's linux-next merge of the infiniband tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d
("net/mlx4_core: Use firmware driven flow steering hash mode") from
Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in
{INIT, QUERY}_HCA") 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-3FnU+UHB4dNDw9hX6IcOSA@public•gmane.org
diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
index ed4a695,8b75d5e..0000000
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@@ -60,6 -60,13 +60,8 @@@
#define MLX4_FS_MGM_LOG_ENTRY_SIZE 7
#define MLX4_FS_NUM_MCG (1 << 17)
+ #define INIT_HCA_TPT_MW_ENABLE (1 << 7)
+
-enum {
- MLX4_FS_L2_HASH = 0,
- MLX4_FS_L2_L3_L4_HASH,
-};
-
#define MLX4_NUM_UP 8
#define MLX4_NUM_TC 8
#define MLX4_RATELIMIT_UNITS 3 /* 100 Mbps */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the infiniband tree with Linus' tree
2013-02-26 0:45 linux-next: manual merge of the infiniband tree with Linus' tree Stephen Rothwell
@ 2013-02-26 7:27 ` Or Gerlitz
0 siblings, 0 replies; 2+ messages in thread
From: Or Gerlitz @ 2013-02-26 7:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Roland Dreier, linux-rdma, linux-next, linux-kernel,
Hadar Hen Zion, David Miller, netdev, Shani Michaeli, Haggai Eran,
Amir Vadai
On 26/02/2013 02:45, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the infiniband tree got a conflict in
> drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d
> ("net/mlx4_core: Use firmware driven flow steering hash mode") from
> Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in
> {INIT, QUERY}_HCA") from the infiniband tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
thanks,
Acked-by: Or Gerlitz <ogerlitz@mellanox•com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-26 7:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-26 0:45 linux-next: manual merge of the infiniband tree with Linus' tree Stephen Rothwell
2013-02-26 7:27 ` Or Gerlitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox