From: Daniel Borkmann <daniel@iogearbox.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Shuah Khan <shuahkh@osg.samsung.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"bamvor.zhangjian@huawei.com" <bamvor.zhangjian@huawei.com>,
Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
Subject: Re: linux-next: manual merge of the kselftest tree with the net-next tree
Date: Wed, 25 Jan 2017 08:39:11 +0100 [thread overview]
Message-ID: <5888561F.9080503@iogearbox.net> (raw)
In-Reply-To: <20170125150321.0b377f57@canb.auug.org.au>
On 01/25/2017 05:03 AM, Stephen Rothwell wrote:
> Hi Shuah,
>
> Today's linux-next merge of the kselftest tree got a conflict in:
>
> tools/testing/selftests/bpf/Makefile
>
> between commit:
>
> 62b64660262a ("bpf: add prog tag test case to bpf selftests")
>
> from the net-next tree and commit:
>
> 88baa78d1f31 ("selftests: remove duplicated all and clean target")
>
> from the kselftest 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-01-25 7:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 4:03 linux-next: manual merge of the kselftest tree with the net-next tree Stephen Rothwell
2017-01-25 7:39 ` Daniel Borkmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-02-16 3:24 Stephen Rothwell
2017-02-22 14:54 ` Shuah Khan
2017-01-24 4:45 Stephen Rothwell
2017-01-24 15:17 ` Shuah Khan
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=5888561F.9080503@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=bamvor.zhangjian@huawei.com \
--cc=bamvor.zhangjian@linaro.org \
--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=shuahkh@osg.samsung.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).