From: Daniel Borkmann <daniel@iogearbox.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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>
Subject: Re: linux-next: manual merge of the net-next tree with the arm64 tree
Date: Mon, 03 Jul 2017 09:54:50 +0200 [thread overview]
Message-ID: <5959F84A.8040808@iogearbox.net> (raw)
In-Reply-To: <20170703113732.6af8235d@canb.auug.org.au>
On 07/03/2017 03:37 AM, Stephen Rothwell wrote:
> 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.
Looks good to me, thanks!
next prev parent reply other threads:[~2017-07-03 7:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 1:37 linux-next: manual merge of the net-next tree with the arm64 tree Stephen Rothwell
2017-07-03 7:54 ` Daniel Borkmann [this message]
-- 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=5959F84A.8040808@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=catalin.marinas@arm.com \
--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=sfr@canb.auug.org.au \
--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).