Merge branch 'bnxt_en-fixes'
authorDavid S. Miller <davem@davemloft.net>
Wed, 27 Apr 2016 20:18:46 +0000 (16:18 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Apr 2016 20:18:46 +0000 (16:18 -0400)
commit97d601d5de6eff9d9acebefa39150940a55e9f19
tree09e48f1ba0bfe519bc81483acf0f6cc48adeba44
parentf28f20da704d399fb1e4d8838ffd697a357d9cc8
parent89d0a06c516339c0a2b3d02677f5d6310b3319fb
Merge branch 'bnxt_en-fixes'

Michael Chan says:

====================
bnxt_en: Bug fixes for net.

Only use MSIX on VF, and fix rx page buffers on architectures with
PAGE_SIZE >= 64K.
====================

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