[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241217174447.2ce50fb6@kernel.org>
Date: Tue, 17 Dec 2024 17:44:47 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: Martin KaFai Lau <martin.lau@...ux.dev>
Cc: Amery Hung <amery.hung@...edance.com>, bpf@...r.kernel.org,
netdev@...r.kernel.org, daniel@...earbox.net, andrii@...nel.org,
alexei.starovoitov@...il.com, martin.lau@...nel.org, sinquersw@...il.com,
toke@...hat.com, jhs@...atatu.com, jiri@...nulli.us, stfomichev@...il.com,
ekarani.silvestre@....ufcg.edu.br, yangpeihao@...u.edu.cn,
xiyou.wangcong@...il.com, yepeilin.cs@...il.com, ameryhung@...il.com
Subject: Re: [PATCH bpf-next v1 01/13] bpf: Support getting referenced kptr
from struct_ops argument
On Tue, 17 Dec 2024 16:58:11 -0800 Martin KaFai Lau wrote:
> There is a conflict in the bpf-next/master. acquire_reference_state has been
> refactored in commit 769b0f1c8214. From looking at the net/sched/sch_*.c
> changes, they should not have conflict with the net-next/main. I would suggest
> to rebase this set on bpf-next/master.
Let's worry about merging once it's ready. Previous version was
5 months ago, the one before that 2 months earlier..
Powered by blists - more mailing lists