Hi all,
This is now a conflict between the net and net-next trees.
On Tue, 8 Oct 2019 09:48:40 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/lib/bpf/Makefile
>
> between commit:
>
> 1bd63524593b ("libbpf: handle symbol versioning properly for libbpf.a")
>
> from the bpf tree and commit:
>
> a9eb048d5615 ("libbpf: Add cscope and tags targets to Makefile")
>
> from the bpf-next 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc tools/lib/bpf/Makefile
> index 56ce6292071b,10b77644a17c..000000000000
> --- a/tools/lib/bpf/Makefile
> +++ b/tools/lib/bpf/Makefile
> @@@ -143,7 -133,9 +143,9 @@@ LIB_TARGET := $(addprefix $(OUTPUT),$(L
> LIB_FILE := $(addprefix $(OUTPUT),$(LIB_FILE))
> PC_FILE := $(addprefix $(OUTPUT),$(PC_FILE))
>
> + TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
> +
> -GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN) | \
> +GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \
> cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
> awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \
> sort -u | wc -l)
--
Cheers,
Stephen Rothwell
Attachment:
pgpWM4h9DyxRe.pgp
Description: OpenPGP digital signature
