From: Daniel Borkmann <daniel@iogearbox.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Yang Shi <yang.shi@linaro.org>, Will Deacon <will.deacon@arm.com>
Subject: Re: linux-next: manual merge of the net-next tree with the arm64 tree
Date: Tue, 17 May 2016 08:05:11 +0200 [thread overview]
Message-ID: <573AB497.2020301@iogearbox.net> (raw)
In-Reply-To: <20160517102441.0cfbc192@canb.auug.org.au>
On 05/17/2016 02:24 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> arch/arm64/Kconfig
>
> between commit:
>
> 8ee708792e1c ("arm64: Kconfig: remove redundant HAVE_ARCH_TRANSPARENT_HUGEPAGE definition")
>
> from the arm64 tree and commit:
>
> 6077776b5908 ("bpf: split HAVE_BPF_JIT into cBPF and eBPF variant")
>
> 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.
Diff looks good, thanks!
next prev parent reply other threads:[~2016-05-17 6:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 0:24 linux-next: manual merge of the net-next tree with the arm64 tree Stephen Rothwell
2016-05-17 0:24 ` Stephen Rothwell
2016-05-17 6:05 ` Daniel Borkmann [this message]
2016-05-17 7:03 ` Geert Uytterhoeven
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
-- strict thread matches above, loose matches on Subject: below --
2017-07-03 1:37 Stephen Rothwell
2017-07-03 7:54 ` 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=573AB497.2020301@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=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=will.deacon@arm.com \
--cc=yang.shi@linaro.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.