From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Kicinski Subject: Re: [PATCH net-next] nfp: bpf: allocate vNIC priv for keeping track of the offloaded program Date: Wed, 27 Dec 2017 20:11:45 -0800 Message-ID: <20171227201145.7a9b8183@cakuba.netronome.com> References: <20171227233649.15018-1-jakub.kicinski@netronome.com> <20171227.203811.663878227338123152.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, oss-drivers@netronome.com To: David Miller Return-path: Received: from mail-qt0-f178.google.com ([209.85.216.178]:39035 "EHLO mail-qt0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbdL1ELt (ORCPT ); Wed, 27 Dec 2017 23:11:49 -0500 Received: by mail-qt0-f178.google.com with SMTP id k19so49952037qtj.6 for ; Wed, 27 Dec 2017 20:11:49 -0800 (PST) In-Reply-To: <20171227.203811.663878227338123152.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org List-ID: On Wed, 27 Dec 2017 20:38:11 -0500 (EST), David Miller wrote: > From: Jakub Kicinski > 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 > > 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 ;)