Messages in this thread | | | Date | Tue, 26 Feb 2013 09:27:06 +0200 | From | Or Gerlitz <> | Subject | Re: linux-next: manual merge of the infiniband tree with Linus' tree |
| |
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>
| |