* MERGE net into net-next
@ 2018-01-12 3:16 David Miller
2018-01-12 10:57 ` Daniel Borkmann
0 siblings, 1 reply; 2+ messages in thread
From: David Miller @ 2018-01-12 3:16 UTC (permalink / raw)
To: netdev; +Cc: daniel
Daniel please look at how I resolved the BPF conflicts and build
failures.
The test_align.c one was pretty simple, but the one that fixes the
build failure due to overlap of the BPF call vs. JIT always on changes
is bit less trivial.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: MERGE net into net-next
2018-01-12 3:16 MERGE net into net-next David Miller
@ 2018-01-12 10:57 ` Daniel Borkmann
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Borkmann @ 2018-01-12 10:57 UTC (permalink / raw)
To: David Miller, netdev
On 01/12/2018 04:16 AM, David Miller wrote:
>
> Daniel please look at how I resolved the BPF conflicts and build
> failures.
>
> The test_align.c one was pretty simple, but the one that fixes the
> build failure due to overlap of the BPF call vs. JIT always on changes
> is bit less trivial.
Yeah, see my reply in the other thread, merge looks good to me. Thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-12 10:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-12 3:16 MERGE net into net-next David Miller
2018-01-12 10:57 ` Daniel Borkmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.