Merge branch 'nfp-next'
authorDavid S. Miller <davem@davemloft.net>
Sun, 17 Apr 2016 02:34:40 +0000 (22:34 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 17 Apr 2016 02:34:40 +0000 (22:34 -0400)
commitefde611b0afa47e64f2a329f4430830b91d77ea2
tree6065a2d9bfe45518f6f8ce4e4425fc2460a70b22
parent7a7c1705dc6c629e3b1dce1c0c1ecc0af87486ac
parent3d780b926a12dd798417446d733d457f1be1cc73
Merge branch 'nfp-next'

Jakub Kicinski says

====================
nfp: cleanups and improvements

Main purpose of this set is to get rid of doing potentially long
mdelay()s but it also contains some trivial changes I've accumulated.
First two patches fix harmless copy-paste errors, next two clean up
the documentation and remove unused defines.  Patch 5 clarifies the
interpretation of RX descriptor fields.  Patch 6, by far the biggest,
adds ability to perform FW reconfig asynchronously thanks to which
we can stop using mdelay().
====================

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