From: David S. Miller Date: Sun, 17 Apr 2016 02:34:40 +0000 (-0400) Subject: Merge branch 'nfp-next' X-Git-Tag: v4.7-rc1~154^2~258 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=efde611b0afa47e64f2a329f4430830b91d77ea2;p=karo-tx-linux.git 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 --- efde611b0afa47e64f2a329f4430830b91d77ea2