From: Shuah Khan <shuahkh@osg.samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>,
"bamvor.zhangjian@huawei.com" <bamvor.zhangjian@huawei.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Herrmann <dh.herrmann@gmail.com>,
Daniel Mack <daniel@zonque.org>
Subject: Re: linux-next: manual merge of the kselftest tree with the net-next tree
Date: Tue, 24 Jan 2017 08:17:21 -0700 [thread overview]
Message-ID: <fd85f7f5-ab0d-3bf5-784d-872f926dd7d7@osg.samsung.com> (raw)
In-Reply-To: <20170124154524.2a993739@canb.auug.org.au>
On 01/23/2017 09:45 PM, 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:
>
> 4d3381f5a322 ("bpf: Add tests for the lpm trie map")
>
> 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.
Yes. Please.
>
> P.S. Shuah, that kselftest commit has a different email address in its
> Author and Signed-off-by.
>
Yes you are right. I didn't notice the discrepancy.
Bamvor! Your gitconfig is outdated perhaps!
thanks,
-- Shuah
next prev parent reply other threads:[~2017-01-24 15:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 4:45 linux-next: manual merge of the kselftest tree with the net-next tree Stephen Rothwell
2017-01-24 15:17 ` Shuah Khan [this message]
2017-01-25 4:03 Stephen Rothwell
2017-01-25 7:39 ` Daniel Borkmann
2017-02-16 3:24 Stephen Rothwell
2017-02-22 14:54 ` 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=fd85f7f5-ab0d-3bf5-784d-872f926dd7d7@osg.samsung.com \
--to=shuahkh@osg.samsung.com \
--cc=bamvor.zhangjian@huawei.com \
--cc=bamvor.zhangjian@linaro.org \
--cc=daniel@zonque.org \
--cc=davem@davemloft.net \
--cc=dh.herrmann@gmail.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.