From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, oss-drivers@netronome.com
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 [thread overview]
Message-ID: <20171227201145.7a9b8183@cakuba.netronome.com> (raw)
In-Reply-To: <20171227.203811.663878227338123152.davem@davemloft.net>
On Wed, 27 Dec 2017 20:38:11 -0500 (EST), David Miller wrote:
> From: Jakub Kicinski <jakub.kicinski@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.kicinski@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 ;)
prev parent reply other threads:[~2017-12-28 4:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-27 23:36 [PATCH net-next] nfp: bpf: allocate vNIC priv for keeping track of the offloaded program Jakub Kicinski
2017-12-28 1:38 ` David Miller
2017-12-28 4:11 ` Jakub Kicinski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171227201145.7a9b8183@cakuba.netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox