From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Will Deacon <will.deacon@arm.com>,
Daniel Borkmann <daniel@iogearbox.net>
Subject: linux-next: manual merge of the net-next tree with the arm64 tree
Date: Mon, 3 Jul 2017 11:37:32 +1000 [thread overview]
Message-ID: <20170703113732.6af8235d@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
arch/arm64/net/bpf_jit_comp.c
between commit:
425e1ed73e65 ("arm64: fix endianness annotation for 'struct jit_ctx' and friends")
from the arm64 tree and commit:
f1c9eed7f437 ("bpf, arm64: take advantage of stack_depth tracking")
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/arm64/net/bpf_jit_comp.c
index 8860bb9c33a1,2f0505b5c240..000000000000
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@@ -70,7 -70,8 +70,8 @@@ struct jit_ctx
int idx;
int epilogue_offset;
int *offset;
- u32 *image;
+ __le32 *image;
+ u32 stack_size;
};
static inline void emit(const u32 insn, struct jit_ctx *ctx)
next reply other threads:[~2017-07-03 1:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 1:37 Stephen Rothwell [this message]
2017-07-03 7:54 ` linux-next: manual merge of the net-next tree with the arm64 tree Daniel Borkmann
-- strict thread matches above, loose matches on Subject: below --
2016-05-17 0:24 Stephen Rothwell
2016-05-17 6:05 ` Daniel Borkmann
2016-05-17 7:03 ` Geert Uytterhoeven
2016-05-17 7:12 ` Daniel Borkmann
2016-05-17 13:38 ` Catalin Marinas
2016-05-17 13:49 ` Daniel Borkmann
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=20170703113732.6af8235d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=catalin.marinas@arm.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luc.vanoostenryck@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=will.deacon@arm.com \
/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).