From: Shuah Khan <skhan@linuxfoundation.org>
To: Masami Hiramatsu <mhiramat@kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Shuah Khan <shuah@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Vlastimil Babka <vbabka@suse.cz>,
skhan@linuxfoundation.org
Subject: Re: linux-next: manual merge of the akpm-current tree with the kselftest tree
Date: Wed, 3 Jun 2020 09:38:01 -0600 [thread overview]
Message-ID: <0137f4b2-78cb-bd87-056a-aa44ac474637@linuxfoundation.org> (raw)
In-Reply-To: <20200603190306.bd85ea37629210c8642f7bd7@kernel.org>
On 6/3/20 4:03 AM, Masami Hiramatsu wrote:
> Hi Stephen,
>
> On Wed, 3 Jun 2020 18:29:01 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi all,
>>
>> Today's linux-next merge of the akpm-current tree got a conflict in:
>>
>> tools/testing/selftests/sysctl/sysctl.sh
>>
>> between commit:
>>
>> eee470e0739a ("selftests/sysctl: Fix to load test_sysctl module")
>>
>> from the kselftest tree and patch:
>>
>> "tools/testing/selftests/sysctl/sysctl.sh: support CONFIG_TEST_SYSCTL=y"
>>
>> from the akpm-current 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.
>
> Thank you for fixing this confliction, at least this fix looks good to me.
> I think this (Vlatimil's patch) should be merged via Shuah's kselftest tree.
>
> https://lkml.org/lkml/2020/4/27/921
>
> This fix seems an independent fix.
>
> Thank you,
>
>>
>> --
>> Cheers,
>> Stephen Rothwell
>>
>> diff --cc tools/testing/selftests/sysctl/sysctl.sh
>> index c3459f9f2429,ce1eeea6f769..000000000000
>> --- a/tools/testing/selftests/sysctl/sysctl.sh
>> +++ b/tools/testing/selftests/sysctl/sysctl.sh
>> @@@ -112,10 -122,9 +112,10 @@@ test_reqs(
>>
>> function load_req_mod()
>> {
>> - if [ ! -d $DIR ]; then
>> + if [ ! -d $DIR -a ! -d $SYSCTL ]; then
>> if ! modprobe -q -n $TEST_DRIVER; then
>> - echo "$0: module $TEST_DRIVER not found [SKIP]"
>> + echo "$0: module $TEST_DRIVER not found and not built-in [SKIP]"
>> + echo "You must set CONFIG_TEST_SYSCTL=m in your kernel" >&2
>> exit $ksft_skip
>> fi
>> modprobe $TEST_DRIVER
>
>
Thanks Stephen for the fixup and Masami for verifying this looks good.
Please carry the fix. I will make a note of the fix in my pull request
to Linus as well to keep us all on the same page.
thanks,
-- Shuah
next prev parent reply other threads:[~2020-06-03 15:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-28 8:31 Stephen Rothwell
2017-06-29 19:35 ` Andrew Morton
2017-06-30 22:43 ` Luis R. Rodriguez
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=0137f4b2-78cb-bd87-056a-aa44ac474637@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shuah@kernel.org \
--cc=vbabka@suse.cz \
/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).