From: David S. Miller <davem@davemloft.net>
Date: Thu, 10 Nov 2016 17:55:26 +0000 (-0500)
Subject: Merge branch 'qed-fixes'
X-Git-Tag: v6.1~15431^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ce0af8fd0a6c2938e49630a0fdf3257464576e3;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'qed-fixes'

Yuval Mintz says:

====================
qed: Fix RoCE infrastructure

This series fixes 2 basic issues with RoCE support,
one handles a missing configuration in the initial infrastructure
support while the other is a regression introduced by one of the
initial fix submissions.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

2ce0af8fd0a6c2938e49630a0fdf3257464576e3