Re: [PATCH bpf-next v2 10/11] bpf: sync bpf uapi header with tools
flat view
From: Daniel Borkmann <daniel@iogearbox.net>
Date: 2018-06-02 21:09:12
On 06/02/2018 10:53 PM, Daniel Borkmann wrote: [...]
quoted hunk ↗ jump to hunk
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 64ac0f7..3f47f62 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h@@ -2008,6 +2008,7 @@ union bpf_attr { * Return * 0 on success, or a negative error in case of failure. * +<<<<<<< c19df1a3088759f66949226160124eca31065b34 * int bpf_rc_keydown(void *ctx, u32 protocol, u64 scancode, u32 toggle) * Description
Sorry for the noise, this went unnoticed in the comment during rebase, therefore tossed the v2 series in patchwork and removed in v3.