From: Andrii Nakryiko <andrii@kernel.org>
Date: Fri, 4 Apr 2025 15:53:24 +0000 (-0700)
Subject: Merge branch 'likely-unlikely-for-bpf_helpers-and-a-small-comment-fix'
X-Git-Tag: v6.16-rc1~131^2~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=893c3938ab5dca5c14157bd80fced95e24784931;p=thirdparty%2Flinux.git

Merge branch 'likely-unlikely-for-bpf_helpers-and-a-small-comment-fix'

Anton Protopopov says:

====================
likely/unlikely for bpf_helpers and a small comment fix

These two commits fix a comment describing bpf_attr in <linux/bpf.h>
and add likely/unlikely macros to <bph/bpf_helpers.h> to be consumed
by selftests and, later, by the static_branch_likely/unlikely macros.

v1 -> v2:
  * squash libbpf and selftests fixes into one patch (Andrii)
====================

Link: https://patch.msgid.link/20250331203618.1973691-1-a.s.protopopov@gmail.com
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---

893c3938ab5dca5c14157bd80fced95e24784931