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: Mon, 20 Feb 2017 10:01:03 +0100 [thread overview]
Message-ID: <58AAB04F.6010400@iogearbox.net> (raw)
In-Reply-To: <20170220105642.616b119b@canb.auug.org.au>
On 02/20/2017 12:56 AM, Stephen Rothwell wrote:
> Hi Kees,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> include/linux/filter.h
>
> between commit:
>
> 74451e66d516 ("bpf: make jited programs visible in traces")
>
> from the net-next tree and commit:
>
> 0f5bf6d0afe4 ("arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX")
>
> from the kspp 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 thanks!
next prev parent reply other threads:[~2017-02-20 9:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-19 23:56 linux-next: manual merge of the kspp tree with the net-next tree Stephen Rothwell
2017-02-20 9:01 ` Daniel Borkmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-13 4:19 Stephen Rothwell
2025-03-26 4:54 ` Stephen Rothwell
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-22 0:06 Stephen Rothwell
2017-02-22 6:35 ` Daniel Borkmann
2017-02-21 23:51 Stephen Rothwell
2017-02-22 6:37 ` 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=58AAB04F.6010400@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 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.