From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1272EC433E0 for ; Wed, 3 Jun 2020 10:03:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB28B2077D for ; Wed, 3 Jun 2020 10:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591178592; bh=OB7T5ZoRQxjYqEYTuavZTDV97mzAgryidXG5qdhMOqY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=0yumFcza8E11DmoclJ49g2KvHYPVx9fbHLSHQ7hbDhfNd7IT2r18rD5V6/zwiNHUw A87IHBFBDa8kPOGdDMaiXJlmPpf/PN2SXf9rdI/ipLhZo5NkbAQQ3cQidOvZwctw4m Byj0wPIK11BLpiki/0t6BNz21qcAAhcBvLRUAMh0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725888AbgFCKDM (ORCPT ); Wed, 3 Jun 2020 06:03:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:34620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725881AbgFCKDM (ORCPT ); Wed, 3 Jun 2020 06:03:12 -0400 Received: from devnote2 (p13154-mobac01.tokyo.ocn.ne.jp [153.233.4.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D34CD20734; Wed, 3 Jun 2020 10:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591178591; bh=OB7T5ZoRQxjYqEYTuavZTDV97mzAgryidXG5qdhMOqY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=X2FaVprgl1V90VWCBGuq9Y/voM82i4GS0+4ou6e8oFQeiUNT4fwARc1aQnbA+72rn cqNy3ifT9d5HshXP768tXdusORCtz8MlMRY5ZBr72Vhj8wAIgYEGZ6LVwhFFPyhzE5 qyDg1fjl9Om2COw5ZrzRtkqUskS/N9BSeTlUZI+o= Date: Wed, 3 Jun 2020 19:03:06 +0900 From: Masami Hiramatsu To: Stephen Rothwell Cc: Andrew Morton , Shuah Khan , Linux Next Mailing List , Linux Kernel Mailing List , Masami Hiramatsu , Vlastimil Babka Subject: Re: linux-next: manual merge of the akpm-current tree with the kselftest tree Message-Id: <20200603190306.bd85ea37629210c8642f7bd7@kernel.org> In-Reply-To: <20200603182901.63dfec97@canb.auug.org.au> References: <20200603182901.63dfec97@canb.auug.org.au> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Hi Stephen, On Wed, 3 Jun 2020 18:29:01 +1000 Stephen Rothwell 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 -- Masami Hiramatsu