]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'bnxt_en-next'
authorDavid S. Miller <davem@davemloft.net>
Sat, 14 Jan 2017 04:21:31 +0000 (23:21 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 14 Jan 2017 04:21:31 +0000 (23:21 -0500)
Michael Chan says:

====================
bnxt_en: Misc. updates for net-next.

Miscellaneous updates including firmware spec update, ethtool -p blinking
LED support, RDMA SRIOV config callback, and minor fixes.

v2: Dropped the DCBX RoCE app TLV patch until the ETH_P_IBOE RDMA patch
is merged.
====================

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

Trivial merge