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
On Sun, Feb 14, 2021 at 1:13 PM Stephen Rothwell wrote:
>
> 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
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
On Sun, Jan 24, 2021 at 4:12 PM Stephen Rothwell wrote:
>
> 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:
>
Thanks, the merge resolution looks good to me!
On Sun, Jan 24, 2021 at 4:12 PM Stephen Rothwell wrote:
>
> 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 zero
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
6 matches
Mail list logo
