Messages in this thread | | | Date | Sat, 02 Aug 2014 15:10:24 -0700 (PDT) | Subject | Re: [PATCH v4 net-next 5/5] net: filter: split 'struct sk_filter' into socket and bpf parts | From | David Miller <> |
| |
From: Alexei Starovoitov <ast@plumgrid.com> Date: Fri, 1 Aug 2014 12:12:36 -0700
> Dave, this patch has trivial conflict with Daniel's > ("team: fix releasing uninitialized pointer to BPF prog") fix. > Let me know if you want me to respin the series or you'll patch up > the conflict yourself.
I took care of this, it was easy to resolve.
Thanks.
| |