From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Shuah Khan <shuahkh@osg.samsung.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Orson Zhai <orson.zhai@linaro.org>,
"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: linux-next: manual merge of the akpm-current tree with the kselftest tree
Date: Wed, 28 Jun 2017 18:31:11 +1000 [thread overview]
Message-ID: <20170628183111.05680b34@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the akpm-current tree got conflicts in:
tools/testing/selftests/sysctl/common_tests
tools/testing/selftests/sysctl/run_numerictests
tools/testing/selftests/sysctl/run_stringtests
between commit:
d644437a1dc6 ("tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict")
from the kselftest tree and commit:
fed7038685f3 ("test_sysctl: add generic script to expand on tests")
from the akpm-current tree.
I fixed it up (I removed the files and so, for now I have effectively
dropped the kselftest tree patch) 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.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-06-28 8:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 8:31 Stephen Rothwell [this message]
2017-06-29 19:35 ` linux-next: manual merge of the akpm-current tree with the kselftest tree Andrew Morton
2017-06-30 22:43 ` Luis R. Rodriguez
2017-06-30 22:44 ` [PATCH v2 0/6] test_sysctl: fix up merge conflicts Luis R. Rodriguez
2017-06-30 22:44 ` [PATCH v2 1/6] test_sysctl: add dedicated proc sysctl test driver Luis R. Rodriguez
2017-06-30 22:44 ` [PATCH v2 2/6] test_sysctl: add generic script to expand on tests Luis R. Rodriguez
2017-06-30 22:44 ` [PATCH v2 3/6] test_sysctl: test against PAGE_SIZE for int Luis R. Rodriguez
2017-06-30 22:44 ` [PATCH v2 4/6] test_sysctl: add simple proc_dointvec() case Luis R. Rodriguez
2017-06-30 22:44 ` [PATCH v2 5/6] test_sysctl: add simple proc_douintvec() case Luis R. Rodriguez
2017-06-30 22:44 ` [PATCH v2 6/6] test_sysctl: test against int proc_dointvec() array support Luis R. Rodriguez
-- strict thread matches above, loose matches on Subject: below --
2020-06-03 8:29 linux-next: manual merge of the akpm-current tree with the kselftest tree Stephen Rothwell
2020-06-03 10:03 ` Masami Hiramatsu
2020-06-03 15:38 ` Shuah Khan
2017-04-24 6:30 Stephen Rothwell
2017-04-18 7:04 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=20170628183111.05680b34@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=orson.zhai@linaro.org \
--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).