From: David S. Miller <davem@davemloft.net>
Date: Thu, 2 Nov 2017 11:27:12 +0000 (+0900)
Subject: Merge branch 'nfp-TC-block-fixes-app-fallback-and-dev_alloc'
X-Git-Tag: Ubuntu-5.0.0-8.9~3596^2~172
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6e1a2882c6dcb680fb8776062719f51d95a0ec0b;p=mirror_ubuntu-disco-kernel.git

Merge branch 'nfp-TC-block-fixes-app-fallback-and-dev_alloc'

Jakub Kicinski says:

====================
nfp: TC block fixes, app fallback and dev_alloc()

This series has three parts.  First of all John and I fix some
fallout from the TC block conversion.  John also fixes sleeping
in the neigh notifier.

Secondly I reorganise the nfp_app table to make it easier to
deal with excluding apps which have unmet Kconfig dependencies.

Last but not least after the fixes which went into -net some time
ago I refactor the page allocation, add a ethtool counter for
failed allocations and clean the ethtool stat code while at it.
====================

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

6e1a2882c6dcb680fb8776062719f51d95a0ec0b