tools: bpf: fix BTF code added twice to different trees
Jakub Kicinski authored
commit 38d5d3b3 ("bpf: Introduce BPF_ANNOTATE_KV_PAIR")

added to the bpf and net trees what

commit 92b57121

 ("bpf: btf: export btf types and name by offset from lib")

has already added to bpf-next/net-next, but in slightly different
location.  Remove the duplicates (to fix build of libbpf).
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
6534770d
Name Last commit Last update
Documentation dt-bindings: net: Add clock handle to Broadcom iProc mdio mux
LICENSES LICENSES: Add Linux-OpenIB license text
arch arm64: dts: Fix the base address of the Broadcom iProc mdio mux
block Merge tag 'for-linus-20180727' of git://git.kernel.dk/linux-block
certs certs/blacklist: fix const confusion
crypto net: simplify sock_poll_wait
drivers xen-netback: use true and false for boolean values
firmware kbuild: remove all dummy assignments to obj-
fs Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
include Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
init Merge tag 'kbuild-fixes-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
ipc Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
kernel Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
lib Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
mm mm: delete historical BUG from zap_pmd_range()
net net/socket: remove duplicated init code
samples Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
scripts Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
security net: sched: introduce chain object to uapi
sound ALSA: hda/realtek - Yet another Clevo P950 quirk entry
tools tools: bpf: fix BTF code added twice to different trees
usr kbuild: rename built-in.o to built-in.a
virt Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
.clang-format clang-format: add configuration file
.cocciconfig scripts: add Linux .cocciconfig for coccinelle
.get_maintainer.ignore
.gitattributes
.gitignore
.mailmap
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS
Makefile
README
Linux kernel
============

There are several guides for kernel developers and users. These guides can
be rendered in a number of formats, like HTML and PDF. Please read
Documentation/admin-guide/README.rst first.

In order to build the documentation, use ``make htmldocs`` or
``make pdfdocs``.  The formatted documentation can also be read online at:

    https://www.kernel.org/doc/html/latest/

There are various text files in the Documentation/ subdirectory,
several of them using the Restructured Text markup notation.
See Documentation/00-INDEX for a list of what is contained in each file.

Please read the Documentation/process/changes.rst file, as it contains the
requirements for building and running the kernel, and information about
the problems which may result by upgrading your kernel.