From: Tejun Heo <tj@kernel.org>
Date: Wed, 4 Sep 2024 21:41:32 +0000 (-1000)
Subject: Merge branch 'bpf/master' into for-6.12
X-Git-Tag: v6.12-rc1~111^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=649e980dadee36f961738d054627225542d547a2;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'bpf/master' into for-6.12

Pull bpf/master to receive baebe9aaba1e ("bpf: allow passing struct
bpf_iter_<type> as kfunc arguments") and related changes in preparation for
the DSQ iterator patchset.

Signed-off-by: Tejun Heo <tj@kernel.org>
---

649e980dadee36f961738d054627225542d547a2