Merge branch 'qed-next'
authorDavid S. Miller <davem@davemloft.net>
Mon, 4 Jun 2018 14:10:47 +0000 (10:10 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Jun 2018 14:10:47 +0000 (10:10 -0400)
Sudarsana Reddy Kalluru says:

====================
qed: Fix issues in UFP feature commit 'cac6f691'.

This patch series fixes couple of issues in the UFP feature commit,
   cac6f691: Add support for Unified Fabric Port.

Changes from previous version:
------------------------------
v2: Added "Fixes:" tag.

Please consider applying it to "net-next".
====================

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

Trivial merge