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=-2.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 C8223C433E0 for ; Wed, 3 Jun 2020 15:38:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A231220679 for ; Wed, 3 Jun 2020 15:38:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591198684; bh=YV6zxgSy0WTvXZ3OuamVP4U30N9d3rO83OAn5+76PgY=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-ID:From; b=nU7Uzz6VZ3uGrEjndVkyfHlox2HA5SRz+1CIt0+NVGv9+jCCbBh4joU6Jywfm84X8 0+mbLp3VYBv1FeG0CrHO+SIRTLy7KaZgZZs4AosS30ZlOUIZTBGJ1UDaWOoGhbb2jh TT+O+z2aqzAtcHxMnF+PSIvQQx5N+hFgNikNXba4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726207AbgFCPiE (ORCPT ); Wed, 3 Jun 2020 11:38:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725954AbgFCPiD (ORCPT ); Wed, 3 Jun 2020 11:38:03 -0400 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63CB5C08C5C0 for ; Wed, 3 Jun 2020 08:38:03 -0700 (PDT) Received: by mail-ot1-x344.google.com with SMTP id h7so2233652otr.3 for ; Wed, 03 Jun 2020 08:38:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=wUY7nP7Sv66k98sXJa54neuqzOTWObAW2W4PIwzpdcI=; b=Hce2Huj/z7Q9ek11o7cfKqDoLMsSsJAXdHOkeMya7IDa47PFfpzfcOXAPi5rcOieca v9U1Bqb3LMEcnUxPIJ5oIx04J/4He+bRR2kTRpQXcmAVGJoIPde08eNEvMrjG5A1mXug f9ueB0QDHqEG7cC0XzKQs0lgBVVWU67s90C74= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=wUY7nP7Sv66k98sXJa54neuqzOTWObAW2W4PIwzpdcI=; b=LrkP+VkKdYRgrSNIvq9CzhteKgjUFIQDgUfocGrGSP0C6mRhLklnsqdaeLBBiucwug vkzWOdbRQ6qSYu/AIlHiojRDaBiX1R25RP7oNUqPxhNdZ1ywlKpkiKSuJej6dfeSSSKH nsLXv/PKk09nLL3h/ZSl2kOYxC0l3wfkfERCqNxeJTfvTuyn6RzKW3Q9ei1AobsNuI/3 KPKexvomzoZBAR1M8jpZ1qMIo+MoYmXK/d7Ia+diPaHbTp6+qMelc8X6lFdKG0qZlK2s RA/iK7X2zKBfDZl5s/lyuOpKGMVOkITiVvlaVK0vx81cUu7bU/Cqjt1NQhdgZTS0sEEZ iCqQ== X-Gm-Message-State: AOAM532v+OBdhreFRXOFfdXKaxw+c8N/ICVhqNc6SPX3hJNSkER90Z8u AKW0w33NSyU5Vn+NYHU73ZgqBw== X-Google-Smtp-Source: ABdhPJwUE2JcDDB2tkm5OymS16GFKtI6YuzIrfZ/noLq1PEptK66UFd9p/iuw4Js3aPAutSewiV5Fw== X-Received: by 2002:a9d:a71:: with SMTP id 104mr472689otg.40.1591198682698; Wed, 03 Jun 2020 08:38:02 -0700 (PDT) Received: from [192.168.1.112] (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id y197sm655155oie.58.2020.06.03.08.38.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Jun 2020 08:38:02 -0700 (PDT) Subject: Re: linux-next: manual merge of the akpm-current tree with the kselftest tree To: Masami Hiramatsu , Stephen Rothwell Cc: Andrew Morton , Shuah Khan , Linux Next Mailing List , Linux Kernel Mailing List , Vlastimil Babka , skhan@linuxfoundation.org References: <20200603182901.63dfec97@canb.auug.org.au> <20200603190306.bd85ea37629210c8642f7bd7@kernel.org> From: Shuah Khan Message-ID: <0137f4b2-78cb-bd87-056a-aa44ac474637@linuxfoundation.org> Date: Wed, 3 Jun 2020 09:38:01 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200603190306.bd85ea37629210c8642f7bd7@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.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 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