From: Daniel Borkmann <daniel@iogearbox.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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>
Subject: Re: linux-next: manual merge of the bpf-next tree with the bpf tree
Date: Mon, 26 Feb 2018 10:03:49 +0100 [thread overview]
Message-ID: <0df3cf32-9f64-b0f0-3a1c-00c1ab52c939@iogearbox.net> (raw)
In-Reply-To: <20180226114147.2ab5c647@canb.auug.org.au>
On 02/26/2018 01:41 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_verifier.c
>
> between commit:
>
> ca36960211eb ("bpf: allow xadd only on aligned memory")
>
> from the bpf tree and commit:
>
> 23d191a82c13 ("bpf: add various jit test cases")
>
> 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.
Looks good, thanks!
next prev parent reply other threads:[~2018-02-26 9:04 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-26 0:41 linux-next: manual merge of the bpf-next tree with the bpf tree Stephen Rothwell
2018-02-26 9:03 ` Daniel Borkmann [this message]
2018-02-26 23:28 ` Stephen Rothwell
2018-04-26 0:53 Stephen Rothwell
2018-04-26 7:57 ` Daniel Borkmann
2018-05-02 2:09 Stephen Rothwell
2018-05-02 4:40 ` Song Liu
2018-05-02 5:50 ` Stephen Rothwell
2018-05-02 6:05 ` Song Liu
2018-05-14 1:57 Stephen Rothwell
2018-05-14 20:41 ` Jakub Kicinski
2018-05-14 21:57 ` Stephen Rothwell
2018-11-12 0:54 Stephen Rothwell
2018-12-04 1:05 Stephen Rothwell
2018-12-04 1:09 Stephen Rothwell
2019-04-17 1:08 Stephen Rothwell
2019-04-24 3:12 ` Stephen Rothwell
2019-10-07 22:48 Stephen Rothwell
2019-10-15 23:27 ` Stephen Rothwell
2019-10-08 22:47 Stephen Rothwell
2019-10-15 23:29 ` Stephen Rothwell
2020-05-15 3:18 Stephen Rothwell
2020-06-26 0:05 Stephen Rothwell
2020-07-06 1:43 ` Stephen Rothwell
2020-09-30 4:07 Stephen Rothwell
2020-10-02 3:59 ` Stephen Rothwell
2021-12-05 23:39 Stephen Rothwell
2022-08-22 1:01 Stephen Rothwell
2022-08-25 0:50 Stephen Rothwell
2022-08-26 1:46 Stephen Rothwell
2022-11-21 1:27 Stephen Rothwell
2023-03-06 22:58 Stephen Rothwell
2023-03-10 0:38 ` Stephen Rothwell
2023-03-10 3:18 ` Bagas Sanjaya
2024-03-07 1:40 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=0df3cf32-9f64-b0f0-3a1c-00c1ab52c939@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=ast@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).