On 06/02/2018 10:53 PM, Daniel Borkmann wrote:
[...]
> 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.
