From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Networking <netdev@vger•kernel.org>
Cc: "Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Toke Høiland-Jørgensen" <toke@redhat•com>,
"Andrii Nakryiko" <andriin@fb•com>
Subject: linux-next: manual merge of the bpf-next tree with Linus' tree
Date: Mon, 24 Aug 2020 10:56:09 +1000 [thread overview]
Message-ID: <20200824105609.0e54b498@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-08-24 0:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-24 0:56 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-22 1:02 linux-next: manual merge of the bpf-next tree with Linus' tree Stephen Rothwell
2024-10-22 3:07 ` Andrii Nakryiko
2024-10-22 14:15 ` Viktor Malik
2023-01-23 22:44 Stephen Rothwell
2023-01-23 22:58 ` Stanislav Fomichev
2022-01-24 21:56 Stephen Rothwell
2022-01-24 21:43 Stephen Rothwell
2020-03-31 0:40 Stephen Rothwell
2019-12-15 23:26 Stephen Rothwell
2019-11-19 0:43 Stephen Rothwell
2019-08-08 2:53 Stephen Rothwell
2018-12-21 2:36 Stephen Rothwell
2018-09-24 0:19 Stephen Rothwell
2018-01-15 0:15 Stephen Rothwell
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=20200824105609.0e54b498@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andriin@fb$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=toke@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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