From: David S. Miller Date: Wed, 13 Sep 2017 20:29:13 +0000 (-0700) Subject: Merge branch 'nfp-card-init' X-Git-Tag: v5.15~10389^2~18 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d371465e81fc740cfa67ef47fbf692350c6b0113;p=mirror_ubuntu-kernels.git Merge branch 'nfp-card-init' Jakub Kicinski says: ==================== nfp: wait more carefully for card init The first patch is a small fix for flower offload, we need a whitelist of supported matches, otherwise the unsupported ones will be ignored. The second and the third patch are adding wait/polling to the probe path. We had reports of driver failing probe because it couldn't find the control process (NSP) on the card. Turns out the NSP will only announce its existence after it's fully initialized. Until now we assumed it will be reachable, just not processing commands (hence we wait for a NOOP command to execute successfully). v2: - fix a bad merge which resulted in a build warning and retest. ==================== Signed-off-by: David S. Miller --- d371465e81fc740cfa67ef47fbf692350c6b0113