Add kind layout, CRCs to BTF

[danielocfb]

Pull request for series with
subject: Add kind layout, CRCs to BTF
version: 3
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=800177

[danielocfb]

Upstream branch: 155addf
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=800177
version: 3

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=800177
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: btf: add kind layout encoding, crcs to UAPI
Applying: libbpf: support kind layout section handling in BTF
Applying: libbpf: use kind layout to compute an unknown kind size
Applying: libbpf: add kind layout encoding, crc support
Applying: libbpf: BTF validation can use kind layout for unknown kinds
Applying: btf: support kernel parsing of BTF with kind layout
Applying: bpf: add BTF CRC verification where present
Applying: bpf: verify base BTF CRC to ensure it matches module BTF
Applying: bpf: switch to --btf_features, add crc,kind_layout features
Using index info to reconstruct a base tree...
A	scripts/pahole-flags.sh
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): scripts/pahole-flags.sh deleted in HEAD and modified in bpf: switch to --btf_features, add crc,kind_layout features. Version bpf: switch to --btf_features, add crc,kind_layout features of scripts/pahole-flags.sh left in tree.
Patch failed at 0009 bpf: switch to --btf_features, add crc,kind_layout features
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

* Unmerged path scripts/pahole-flags.sh