linux-next: manual merge of the bpf-next tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  tools/lib/bpf/libbpf.c

between commit:

  1e891e513e16 ("libbpf: Fix map index used in error message")

from Linus' tree and commit:

  88a82120282b ("libbpf: Factor out common ELF operations and improve logging")

from the bpf-next tree.

I fixed it up (the latter included the fix from the former) 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

Attachment: pgpBoLMq1bNXj.pgp
Description: OpenPGP digital signature