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.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,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 2941EC433DF for ; Wed, 24 Jun 2020 04:06:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0426620874 for ; Wed, 24 Jun 2020 04:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592971583; bh=Ua6lB42IyABJSBPH2fW/GfDOYG86wj9YaP8tlq4CKuQ=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:List-ID: From; b=zsH++ECN0DDtqvmjDwgPwwMMTlb83wO48xLJkr8ELjfPw7km0oeNq2FRbKZ0m/xKw s49U6HinPOFRtFwsDRLB8hQMpRbI930bCcROBZvL6U5NeJENvbCatpf073lhcqbv0X WEqiCYnQ1KdR388w4/k2hjvi+RKjcEWshSWXQ7EI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725831AbgFXEGW (ORCPT ); Wed, 24 Jun 2020 00:06:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:56920 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725765AbgFXEGV (ORCPT ); Wed, 24 Jun 2020 00:06:21 -0400 Received: from paulmck-ThinkPad-P72.home (50-39-105-78.bvtn.or.frontiernet.net [50.39.105.78]) (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 57F5C2085B; Wed, 24 Jun 2020 04:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592971581; bh=Ua6lB42IyABJSBPH2fW/GfDOYG86wj9YaP8tlq4CKuQ=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=lPYww/NXRZWF9cd//sbPGLIXeNwDD2PGE3vAi40h3KeJig255CjrlifOAL8MFKvJf WlUqMEpSMZJwoPVfSbFln2SCxqi49RasZxS8UizPJNa8iE/Mhb6s293GC/s2XHAH3r dOsx0EH6kCfFXbwKt+40hObQfa3gwzqkowc6ttbE= Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 3F7EA352265B; Tue, 23 Jun 2020 21:06:21 -0700 (PDT) Date: Tue, 23 Jun 2020 21:06:21 -0700 From: "Paul E. McKenney" To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the rcu tree with the tip tree Message-ID: <20200624040621.GC9247@paulmck-ThinkPad-P72> Reply-To: paulmck@kernel.org References: <20200624130450.57e793f9@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200624130450.57e793f9@canb.auug.org.au> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Jun 24, 2020 at 01:04:50PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rcu tree got a conflict in: > > kernel/sched/core.c > > between commit: > > 964ed98b0752 ("sched/core: Fix ttwu() race") > > from the tip tree and commit: > > 3c88d09bfb1b ("EXP sched: Alleged fix for v5.8 merge-window scheduler issue") > > from the rcu tree. > > I fixed it up (I used the version from the tip tree) 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. Gah. I will move my copy of this patch out of the rcu/next batch. I included it so that I could find other bugs. ;-) Thanx, Paul