From: broonie@kernel.org
To: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
Cc: Andres Freund <andres@anarazel.de>,
Andrii Nakryiko <andrii@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Quentin Monnet <quentin@isovalent.com>
Subject: linux-next: manual merge of the perf tree with the origin tree
Date: Fri, 5 Aug 2022 12:45:29 +0100 [thread overview]
Message-ID: <20220805114529.33777-1-broonie@kernel.org> (raw)
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
reply other threads:[~2022-08-05 11:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220805114529.33777-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=acme@redhat.com \
--cc=andres@anarazel.de \
--cc=andrii@kernel.org \
--cc=arnaldo.melo@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=quentin@isovalent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).