John says: There are few bugs in the merge encap code that have come to light with recent driver changes. Effectively, flow bind callbacks were being registered twice when using internal ports (new 'busy' code triggers this). There was also an issue with neighbour notifier messages being ignored for internal ports.
John Hurley (2): nfp: flower: prevent ingress block binds on internal ports nfp: flower: handle neighbour events on internal ports drivers/net/ethernet/netronome/nfp/flower/offload.c | 7 ++++--- drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) -- 2.21.0