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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E8E1C3DA6F for ; Thu, 17 Aug 2023 18:28:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354438AbjHQS20 (ORCPT ); Thu, 17 Aug 2023 14:28:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354492AbjHQS2F (ORCPT ); Thu, 17 Aug 2023 14:28:05 -0400 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2091A3C01 for ; Thu, 17 Aug 2023 11:27:48 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-790af3bfa5cso664739f.1 for ; Thu, 17 Aug 2023 11:27:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1692296867; x=1692901667; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=my5DnY3IzJeZvSxlM4n+SCWlVwxvpEaGynhkt3Lq4Ic=; b=KEcLvii/5oBxfq7gRCPxpR8Z0b4w3Mx2F/ErAEJJykwfPyq7LiMGrm+U5Q/O2LUBIz tVVM7/Tbp7kVuwGyoYQJCb3k5zAzMiHmSxNwizAuOSU8vxEvF00ikTw5HL2MOVMJ7ZIc 30Q54G6mVLeCzU05bRNIA4IvREmIpdMUq0mHk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692296867; x=1692901667; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=my5DnY3IzJeZvSxlM4n+SCWlVwxvpEaGynhkt3Lq4Ic=; b=AsYEVDu3ISU0hwkETob7Q6XqUNFb7PfEZu6Gb3mKlJ4st+1Fx7KQFLi8aYEbmHHAOx leMFnud7w2edDzXpkkhOAmSzSREYX7qay2kca25BEUzbVoUioC2Ufu6+YZkOjxn0sry5 7zDI4CTw+1f5WBWfoaBlEMyWA8uL6Vmnj3RUP3oXgbxwWMLRLZzQNSnpDMW0jAKnjOhX f5FjvuffUSwa8qJf6JWAEoOTWJb+rvRWMpd2r43CfC/bmDDbPLfZAjcPotzyur40JcHh GVQNymzas1H07sHb5Dt1hkjSrbw9a4T72hAdgKQp9N6D0I8ntyDJp0Ev7wke2GgVEkiu zKHw== X-Gm-Message-State: AOJu0Yyt0TsTmIxRrgkSq2oJq+Hoo8LjEg2LV8Rwn6TgQMi3NuDTrLCG s9qTHSKUTVJNGS2FVnFcVQ5cwg== X-Google-Smtp-Source: AGHT+IFZh9V+tCLewXPjP0YxTdnsXmATpTP0zqTUgiHwm+rfDhfmjoXbho/l4gH9c1Ifbmc7dgxeyw== X-Received: by 2002:a5d:9d8b:0:b0:791:ad39:660b with SMTP id ay11-20020a5d9d8b000000b00791ad39660bmr679513iob.0.1692296867484; Thu, 17 Aug 2023 11:27:47 -0700 (PDT) Received: from [192.168.1.128] ([38.15.45.1]) by smtp.gmail.com with ESMTPSA id dq14-20020a0566384d0e00b0042b1354452csm4629jab.83.2023.08.17.11.27.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Aug 2023 11:27:47 -0700 (PDT) Message-ID: <9cfb4fe4-162b-3f26-646b-71bed3493925@linuxfoundation.org> Date: Thu, 17 Aug 2023 12:27:46 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: linux-next: duplicate patch in the nolibc tree Content-Language: en-US To: =?UTF-8?Q?Thomas_Wei=c3=9fschuh?= , Stephen Rothwell , Willy Tarreau , Christian Brauner , "Paul E. McKenney" Cc: Linux Kernel Mailing List , Linux Next Mailing List , Shuah Khan References: <20230817133811.0a73c624@canb.auug.org.au> From: Shuah Khan In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/17/23 10:30, Thomas Weißschuh wrote: > On 2023-08-17 13:38:11+1000, Stephen Rothwell wrote: >> The following commit is also in the vfs-brauner tree as a different commit >> (but the same patch): >> >> ba859b2e419c ("selftests/nolibc: drop test chmod_net") >> >> This is commit >> >> 49319832de90 ("selftests/nolibc: drop test chmod_net") >> >> in the vfs-brauner tree. > > I think we can drop the patch from the nolibc tree. > The patch is only really necessary in combination with > commit 18e66ae67673 ("proc: use generic setattr() for /proc/$PID/net") > which already is and should stay in the vfs tree. Thomas, Do the rest of the nolibc patches build without this if we were to drop this patch? Dorpping requires rebase and please see below. Willy, Paul, How do we want to handle this so we can avoid rebasing to keep the Commit IDs the same as one ones in Willy's nolibc branch? I would recommend dropping this commit from vfs-brauner if it doesn't cause problems. thanks, -- Shuah