linux-next: manual merge of the perf tree with the origin tree

linux-next: manual merge of the perf tree with the origin tree

[broonie]

Hi all,

Today's linux-next merge of the perf tree got a conflict in:

  tools/bpf/bpftool/Makefile

between commit:

  450a8dcb8c7f8 ("bpftool: Remove zlib feature test from Makefile")

from the origin tree and commit:

  1e1613f64cc8a ("tools bpftool: Don't display disassembler-four-args feature test")

from the perf tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc tools/bpf/bpftool/Makefile
index 6b5b3a99f79d4,517df016d54a2..0000000000000
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile
@@@ -93,8 -93,9 +93,8 @@@ INSTALL ?= instal
  RM ?= rm -f
  
  FEATURE_USER = .bpftool
 -FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled zlib libcap \
 -	clang-bpf-co-re
 -FEATURE_DISPLAY = libbfd zlib libcap clang-bpf-co-re
 +FEATURE_TESTS = libbfd disassembler-four-args libcap clang-bpf-co-re
- FEATURE_DISPLAY = libbfd disassembler-four-args libcap clang-bpf-co-re
++FEATURE_DISPLAY = libbfd libcap clang-bpf-co-re
  
  check_feat := 1
  NON_CHECK_FEAT_TARGETS := clean uninstall doc doc-clean doc-install doc-uninstall