From: Daniel Borkmann <daniel@iogearbox.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Kees Cook <keescook@google.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Laura Abbott <labbott@redhat.com>
Subject: Re: linux-next: manual merge of the kspp tree with the net-next tree
Date: Wed, 22 Feb 2017 07:35:12 +0100 [thread overview]
Message-ID: <58AD3120.7020300@iogearbox.net> (raw)
In-Reply-To: <20170222110629.53d01cf5@canb.auug.org.au>
On 02/22/2017 01:06 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> include/linux/filter.h
>
> between commit:
>
> 9d876e79df6a ("bpf: fix unlocking of jited image when module ronx not set")
>
> from the net-next tree and commit:
>
> 0f5bf6d0afe4 ("arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX")
>
> from the kspp tree.
>
> Hmmm, both these change the ifdef guards I have used the one from the
> net-next tree (CONFIG_ARCH_HAS_SET_MEMORY) for today, please let me know
> if that is not correct.
That's fine, thanks!
next prev parent reply other threads:[~2017-02-22 6:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-22 0:06 linux-next: manual merge of the kspp tree with the net-next tree Stephen Rothwell
2017-02-22 6:35 ` Daniel Borkmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-07 5:29 Stephen Rothwell
2024-03-07 19:23 ` Kees Cook
2020-07-27 9:27 Stephen Rothwell
2020-08-05 4:05 ` Stephen Rothwell
2017-02-21 23:51 Stephen Rothwell
2017-02-22 6:37 ` Daniel Borkmann
2017-02-19 23:56 Stephen Rothwell
2017-02-20 9:01 ` Daniel Borkmann
2017-02-08 1:30 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=58AD3120.7020300@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=keescook@google.com \
--cc=labbott@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).