From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Networking <netdev@vger•kernel.org>,
Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the bpf-next tree with the s390 tree
Date: Tue, 8 May 2018 10:26:38 +1000 [thread overview]
Message-ID: <20180508102638.1e19b7f2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 748 bytes --]
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
arch/s390/net/bpf_jit.S
between commit:
de5cb6eb514e ("s390: use expoline thunks in the BPF JIT")
from the s390 tree and commit:
e1cf4befa297 ("bpf, s390x: remove ld_abs/ld_ind")
from the bpf-next tree.
I fixed it up (I just removed the file as the latter does) 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:[~2018-05-08 0:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-08 0:26 Stephen Rothwell [this message]
2018-05-08 8:19 ` linux-next: manual merge of the bpf-next tree with the s390 tree Daniel Borkmann
2018-05-09 4:21 ` Stephen Rothwell
2018-05-09 6:31 ` Daniel Borkmann
-- strict thread matches above, loose matches on Subject: below --
2025-07-04 3:11 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=20180508102638.1e19b7f2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ast@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=schwidefsky@de$(echo .)ibm.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