Messages in this thread | | | From | Jack Morgenstein <> | Subject | Re: linux-next: manual merge of the net-next tree with the infiniband tree | Date | Mon, 16 Jul 2012 11:34:34 +0300 |
| |
On Thursday 12 July 2012 05:13, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > include/linux/mlx4/device.h between commit 396f2feb05d7 ("mlx4_core: > Implement mechanism for reserved Q_Keys") from the infiniband tree and > commit 0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering > firmware API") from the net-next tree. > > Just context changes. I fixed it up (see below) and can carry the fix > as necessary.
Thanks, Stephen!
Your merge looks fine. Ack.
-Jack
| |