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=-5.4 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,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 262A3C433E0 for ; Fri, 12 Feb 2021 15:31:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8F9D64DF0 for ; Fri, 12 Feb 2021 15:31:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230221AbhBLPbX (ORCPT ); Fri, 12 Feb 2021 10:31:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbhBLPbJ (ORCPT ); Fri, 12 Feb 2021 10:31:09 -0500 Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC851C061756 for ; Fri, 12 Feb 2021 07:30:28 -0800 (PST) Received: by mail-io1-xd35.google.com with SMTP id z21so8308547iob.7 for ; Fri, 12 Feb 2021 07:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=offNES+WoCXP4r9MqdlrB2PaP4ULhXnwzksUvKn0s9g=; b=BImA9WnABOwuvHJuOCLk4IyInjzUNAZ5LAcE7ci12u0pFt1uLrtFyddKgQRViPKs9H WHrJYzriNJuu/1JQNkcwPAHm0IoCEX1/CKHtW0U8ho/9+y5Lq20BRKyTpyKzdd7h4+WK bFWarq12kN/6KPaLTu11DI3d71MS/bnXOF5R2gpgh6dvQaxzslJqqzlhFAyjEuFUNuE2 LLkB+Uc1A5l6Q/QXdRduCvqaMjIHx0E3lw5t90V5E+RLu4UXYevUlHJ4zOZix369MBn6 bOBfn6p++PLnJ493qQC3bV4/GacE8fQoTQIDN9ONDAPpwAivAreqhwyoj8xeIdNI1yrU TahA== 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=offNES+WoCXP4r9MqdlrB2PaP4ULhXnwzksUvKn0s9g=; b=T3svybVA7yxK+zeCvnhNaKzTOrDp+mhifxz6OpLDmDhMejd++81y+djpvEkwWkYHIA l2huu0RH+QWJ0aD7ltjSxYrFLTN6qByAiTYjiKEQOl59cVsmbFxRlJk8fWIrf3E6Fy2q Q9SM7KSos7VEUyVlglENkeecyKGt8zW3ji97M7pFs+fPFeKFVojGpsy0/cMWa8N2UfBX 5JXCA4GStBCyklUldmWIYiwbhVMYh7UnhO9Jr74bQ/21nOFVL8QvnQ8mMj3/mZhU5jH5 dgo911eE+GOWC1rpWr886ccie95sJTM/vh00SRubf5OP5uZxSfigEtz9RqilnzfUNayO WJUA== X-Gm-Message-State: AOAM532L5DwDw0VvCevuRfpaTHVP7qkLxrmkuRHLuup3vF4zXaEHXMjh C14QOIRNhNRDZWYyaopx0ZuZAA== X-Google-Smtp-Source: ABdhPJzzj7ZF9BLPJJuz3o5a3Kmr/Llvs84MLXqJEMRK8mSLYZxcDqVk1CtRG/bbNTNxUdvqyxnsgw== X-Received: by 2002:a02:660b:: with SMTP id k11mr3251814jac.120.1613143828470; Fri, 12 Feb 2021 07:30:28 -0800 (PST) Received: from [192.168.1.30] ([65.144.74.34]) by smtp.gmail.com with ESMTPSA id d2sm4593952ilr.66.2021.02.12.07.30.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Feb 2021 07:30:27 -0800 (PST) Subject: Re: linux-next: manual merge of the rcu tree with the block tree To: Frederic Weisbecker , Stephen Rothwell Cc: "Paul E. McKenney" , Linux Kernel Mailing List , Linux Next Mailing List , "Peter Zijlstra (Intel)" References: <20210211164852.7489b87d@canb.auug.org.au> <20210212151853.GC94816@lothringen> From: Jens Axboe Message-ID: <858e7874-83c9-e4b9-a0a9-31be5a0c853e@kernel.dk> Date: Fri, 12 Feb 2021 08:30:27 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210212151853.GC94816@lothringen> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On 2/12/21 8:18 AM, Frederic Weisbecker wrote: > On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the rcu tree got conflicts in: >> >> include/linux/rcupdate.h >> kernel/rcu/tree.c >> kernel/rcu/tree_plugin.h >> >> between commits: >> >> 3a7b5c87a0b2 ("rcu/nocb: Perform deferred wake up before last idle's need_resched() check") >> e4234f21d2ea ("rcu: Pull deferred rcuog wake up to rcu_eqs_enter() callers") >> 14bbd41d5109 ("entry/kvm: Explicitly flush pending rcuog wakeup before last >> rescheduling point") >> from the block tree and commits: > > Isn't it tip:/sched/core instead of block? It must be, maybe block just got merged first? It's just sched/core in a topic branch, to satisfy a dependency. But as mentioned in the previous email, I just need sched/smp to satisfy that dependency. So I've rebased that small topic branch with that pulled in instead. Won't solve the sched/core vs rcu tree conflict, but at least it's out of my hands now :-) -- Jens Axboe