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 3E8E3C433FE for ; Tue, 29 Nov 2022 21:39:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237089AbiK2Vjc (ORCPT ); Tue, 29 Nov 2022 16:39:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236228AbiK2Vj2 (ORCPT ); Tue, 29 Nov 2022 16:39:28 -0500 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 038F76153D for ; Tue, 29 Nov 2022 13:39:28 -0800 (PST) Received: by mail-il1-x135.google.com with SMTP id g7so7303848ile.0 for ; Tue, 29 Nov 2022 13:39:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; 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=S2p1eoCdr7KfcBrhs1qvBb6yKyIDUaXwqBy/UqiA0oU=; b=CXGl0fZB4PaRYBUGI0z2HYZzP6fqFPVKlGn03PWwWzbfs56WKmqEpQNQu7T8LgiVfR pymxDoBGBdAqVj/jwHnhQZ7xmjPb0yl9JqCEW9ZzerE/3rpiFVaNtV8b9hc2rm7dugfd vvTWxvjiFn0acdJVBTJwP2OD5qbktoNW7SLpE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=S2p1eoCdr7KfcBrhs1qvBb6yKyIDUaXwqBy/UqiA0oU=; b=ALJ+h60EMT3GJNp2/WdrPQcdalJNfN+F+KyuiIrLanMlzilbpXMhiZeQ6l2zyvE7uH RhS9nC3E3wAqISwR5h6HSubDJlG7p4owKMUkgogYm9FWRY9RX5Njvxw9PvWFkv0Pv6O2 wqIeRHLg4Zwok1rnXRFvC2p9SQXGMV183IxJ+mwQsEfAWG9/pLTahpWugd/wO0LNM5MH cDqESA6wPPOtgxbFWCQhN3OweFcE8jMwNh27n+RC5WgWZ2z546V+gUGbp0THuFMqNtyF DfsRRkdVoxADvQl/fy/CsM0dIvyLv+2Ax7TdvzbBkYwtLSoMocqP8FZHR4jJH7zHLoFF F0Ww== X-Gm-Message-State: ANoB5pm7G4OEr9duX9tEZ2dmIfPuGPgHLsbKdmKTMngUT+tmfp4ZvV1j Ztn5gtNosPTJEY1cdubKXufaGA== X-Google-Smtp-Source: AA0mqf6qH8euA+r+n8UH6TRig9rXw48v6aSaV/uV9RFgbhVk5ix+kLdPJC7ckGCJzrlPqLBd3gm7CA== X-Received: by 2002:a92:db11:0:b0:303:1648:f2b9 with SMTP id b17-20020a92db11000000b003031648f2b9mr5085884iln.56.1669757967308; Tue, 29 Nov 2022 13:39:27 -0800 (PST) Received: from [192.168.1.128] ([38.15.45.1]) by smtp.gmail.com with ESMTPSA id b15-20020a02a58f000000b00389e3ca3285sm2014077jam.114.2022.11.29.13.39.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Nov 2022 13:39:26 -0800 (PST) Message-ID: Date: Tue, 29 Nov 2022 14:39:25 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 0/6] selftests: Use "grep -E" instead of "egrep" Content-Language: en-US To: Tiezhu Yang , "Paul E. McKenney" Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, shuah@kernel.org, Shuah Khan References: <1669165413-12035-1-git-send-email-yangtiezhu@loongson.cn> From: Shuah Khan In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/22/22 19:27, Tiezhu Yang wrote: > It seems that patch #2~#6 has no conflicts with the other related > git tree, but patch #1 is conflicted with paulmck/linux-rcu.git dev. > > What should I do? > > Shuah, could you please apply patch #2~#6 to your linux-kselftest.git next branch and ignore patch #1? > > And then let me send a seperate patch #1 rebased on paulmck/linux-rcu.git dev branch to rcu@vger.kernel.org. > That won't work because linux-kselftest next won't have the linux-rcu content. I already picked patches 1,2,6 Patches 3 (powerpc) and 5 (net) go through powerpc and net trees. Please resend just those cc'ing the right people. get_maintainers.pl will give you the info. As for patch 1 - perhaps the conflict could be resolved in next. Paul, would you like me to drop rcutorture patch from linux-kselftest next? thanks, -- Shuah