Hi Arjun,
On Sun, 14 Feb 2021 13:40:38 -0800 Arjun Roy wrote:
>
> Sorry, I was confused from the prior email. Is any action required at
> the moment, or not?
No. This is just something that the net-next and bpf-next maintainers
need to sort out when they merge their trees.
--
Cheers,
Stephen
Hi all,
On Mon, 25 Jan 2021 11:12:23 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> net/ipv4/tcp.c
>
> between commit:
>
> 7eeba1706eba ("tcp: Add receive timestamp support for receive zerocopy.")
>
> from the net-next tree and com
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
net/ipv4/tcp.c
between commit:
7eeba1706eba ("tcp: Add receive timestamp support for receive zerocopy.")
from the net-next tree and commit:
9cacf81f8161 ("bpf: Remove extra lock_sock for TCP_ZEROCOPY_RECEIVE")
fro
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
net/core/dev.c
between commit:
829eb208e80d ("rtnetlink: add support for protodown reason")
from the net-next tree and commits:
7f0a838254bd ("bpf, xdp: Maintain info on attached XDP BPF programs in
net_device")
[...]
> diff --cc include/net/xdp.h
> index d3005bef812f,5be0d4d65b94..
> --- a/include/net/xdp.h
> +++ b/include/net/xdp.h
> @@@ -104,15 -98,12 +104,21 @@@ struct xdp_frame
> struct net_device *dev_rx; /* used by cpumap */
> };
>
> +static inline struct skb_shared_info *
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
include/net/xdp.h
between commit:
2f0bc54ba9a8 ("xdp: introduce xdp_get_shared_info_from_{buff, frame} utility
routines")
from the net-next tree and commits:
9216477449f3 ("bpf: cpumap: Add the possibility to atta
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
include/linux/filter.h
between commit:
4d295e546115 ("net: simplify cBPF setsockopt compat handling")
from the net-next tree and commits:
e9ddbb7707ff ("bpf: Introduce SK_LOOKUP program type with a dedicated attach
On 04/26/2018 02:49 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/testing/selftests/bpf/.gitignore
>
> between commit:
>
> 0abf854d7cbb ("selftests: bpf: update .gitignore with missing generated
> files")
>
> from the
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
tools/testing/selftests/bpf/.gitignore
between commit:
0abf854d7cbb ("selftests: bpf: update .gitignore with missing generated
files")
from the net-next tree and commit:
b6fd9cf796e6 ("selftests: bpf: update .giti
