From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Daniel Borkmann <daniel@iogearbox•net>
Subject: linux-next: manual merge of the net-next tree with the s390 tree
Date: Wed, 22 Feb 2017 10:15:16 +1100 [thread overview]
Message-ID: <20170222101516.2f516e2d@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
arch/s390/net/bpf_jit_comp.c
between commit:
9437964885f8 ("s390/bpf: remove redundant check for non-null image")
from the s390 tree and commit:
9d876e79df6a ("bpf: fix unlocking of jited image when module ronx not set")
from the net-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 arch/s390/net/bpf_jit_comp.c
index b3b0af86b84e,b49c52a02087..000000000000
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@@ -1331,11 -1323,14 +1323,11 @@@ struct bpf_prog *bpf_int_jit_compile(st
}
if (bpf_jit_enable > 1) {
bpf_jit_dump(fp->len, jit.size, pass, jit.prg_buf);
- if (jit.prg_buf)
- print_fn_code(jit.prg_buf, jit.size_prg);
- }
- if (jit.prg_buf) {
- bpf_jit_binary_lock_ro(header);
- fp->bpf_func = (void *) jit.prg_buf;
- fp->jited = 1;
+ print_fn_code(jit.prg_buf, jit.size_prg);
}
- set_memory_ro((unsigned long)header, header->pages);
++ bpf_jit_binary_lock_ro(header);
+ fp->bpf_func = (void *) jit.prg_buf;
+ fp->jited = 1;
free_addrs:
kfree(jit.addrs);
out:
next reply other threads:[~2017-02-21 23:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-21 23:15 Stephen Rothwell [this message]
2017-02-22 6:33 ` linux-next: manual merge of the net-next tree with the s390 tree Daniel Borkmann
-- strict thread matches above, loose matches on Subject: below --
2018-05-29 3:00 Stephen Rothwell
2025-09-23 13:07 Mark Brown
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=20170222101516.2f516e2d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(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