On Wed, 27 Dec 2017 20:38:11 -0500 (EST), David Miller wrote: > From: Jakub Kicinski <jakub.kicin...@netronome.com> > Date: Wed, 27 Dec 2017 15:36:49 -0800 > > > After TC offloads were converted to callbacks we have no choice > > but keep track of the offloaded filter in the driver. > > > > Since this change came a little late in the release cycle > > there were a number of conflicts and allocation of vNIC priv > > structure seems to have slipped away in linux-next. > > > > Signed-off-by: Jakub Kicinski <jakub.kicin...@netronome.com> > > Oh well, I thought I resolved the merge conflict properly in this > case. Apparently not :-)
The resolution looks suspiciously similar to what Stephen did in linux-next, but I wasn't sure if you reuse his resolutions hence no Fixes: 903628bbc3a7 ;)
