On Wed, Apr 7, 2021 at 8:11 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/core/skmsg.c
>
> between commit:
>
> 144748eb0c44 ("bpf, sockmap: Fix incorrect fwd_alloc accounting")
>
> from the bpf tree and commit:
>
>
On Wed, Apr 7, 2021 at 8:02 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> include/linux/skmsg.h
>
> between commit:
>
> 1c84b33101c8 ("bpf, sockmap: Fix sk->prot unhash op reset")
>
> from the bpf tree and commit:
>
>
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/core/skmsg.c
between commit:
144748eb0c44 ("bpf, sockmap: Fix incorrect fwd_alloc accounting")
from the bpf tree and commit:
e3526bb92a20 ("skmsg: Move sk_redir from TCP_SKB_CB to skb")
from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/skmsg.h
between commit:
1c84b33101c8 ("bpf, sockmap: Fix sk->prot unhash op reset")
from the bpf tree and commit:
8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")
from the
On Mon, Mar 29, 2021 at 12:29:16PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> include/linux/bpf.h
>
> between commit:
>
> 861de02e5f3f ("bpf: Take module reference for trampoline in module")
>
> from the bpf tree and
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/bpf.h
between commit:
861de02e5f3f ("bpf: Take module reference for trampoline in module")
from the bpf tree and commit:
69c087ba6225 ("bpf: Add bpf_for_each_map_elem() helper")
from the net-next
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/btf.c
between commit:
5b801dfb7feb ("bpf: Fix NULL pointer dereference in
__btf_resolve_helper_id()")
from the bpf tree and commit:
138b9a0511c7 ("bpf: Remove btf_id helpers resolving")
from the
On 2020-05-26 05:12, Stephen Rothwell wrote:
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/xdp/xdp_umem.c
between commit:
b16a87d0aef7 ("xsk: Add overflow check for u64 division, stored into u32")
from the bpf tree and commit:
2b43470add8c ("xsk: Introduce AF_XDP buffer allocation API")
from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/bpf/Makefile
between commit:
25a7991c84f6 ("selftests/bpf: move test_lirc_mode2_user to
TEST_GEN_PROGS_EXTENDED")
from the bpf tree and commit:
2d2a3ad872f8 ("selftests/bpf: add btf_dump
On Tue, Feb 19, 2019 at 5:07 PM Daniel Borkmann wrote:
>
> On 02/20/2019 01:41 AM, Alexei Starovoitov wrote:
> > On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell
> > wrote:
> >>
> >> Hi all,
> >>
> >> Today's linux-next merge of the net-next tree got a conflict in:
> >>
> >>
On 02/20/2019 01:41 AM, Alexei Starovoitov wrote:
> On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell
> wrote:
>>
>> Hi all,
>>
>> Today's linux-next merge of the net-next tree got a conflict in:
>>
>> tools/testing/selftests/bpf/test_progs.c
>>
>> between commit:
>>
>> f6be4d16039b
Hi Stanislav,
On Tue, 19 Feb 2019 16:45:46 -0800 Stanislav Fomichev wrote:
>
> OTOH, I don't understand why is there a conflict? bpf and bpf-next
> adding tests in the same place/file? Those can be trivially resolved
> when bpf and bpf-next are merged in the next window.
Yes, and yes :-)
--
On Tue, Feb 19, 2019 at 4:41 PM Alexei Starovoitov
wrote:
>
> On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell
> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in:
> >
> > tools/testing/selftests/bpf/test_progs.c
> >
> > between commit:
> >
> >
On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_progs.c
>
> between commit:
>
> f6be4d16039b ("selftests/bpf: make sure signal interrupts
> BPF_PROG_TEST_RUN")
Ouch.
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/bpf/test_progs.c
between commit:
f6be4d16039b ("selftests/bpf: make sure signal interrupts BPF_PROG_TEST_RUN")
from the bpf tree and commits:
bf0f0fd93945 ("selftests/bpf: add simple
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/bpf/test_verifier.c
between commit:
7640ead93924 ("bpf: verifier: make sure callees don't prune with caller
differences")
from the bpf tree and commit:
e3da08d05700 ("bpf: allow BPF read
On Tue, Jan 09, 2018 at 11:21:25AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_align.c
>
> between commit:
>
> 2b36047e7889 ("selftests/bpf: fix test_align")
>
> from the bpf tree and
On Tue, Jan 09, 2018 at 11:21:25AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_align.c
>
> between commit:
>
> 2b36047e7889 ("selftests/bpf: fix test_align")
>
> from the bpf tree and
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/bpf/test_align.c
between commit:
2b36047e7889 ("selftests/bpf: fix test_align")
from the bpf tree and commit:
6a28b446b7d2 ("selftests/bpf: adjust test_align expected output")
from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/bpf/test_align.c
between commit:
2b36047e7889 ("selftests/bpf: fix test_align")
from the bpf tree and commit:
6a28b446b7d2 ("selftests/bpf: adjust test_align expected output")
from the
21 matches
Mail list logo
