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 5E819C43331 for ; Thu, 26 Mar 2020 12:45:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B81F20748 for ; Thu, 26 Mar 2020 12:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585226737; bh=T3njjh52p6b6vwMAGsltE6JPsOJ6iFn2pTAXPMFbFEw=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:List-ID: From; b=z79a8OKcNBKuHVoagbbajnhw9EOiM2CWcHCoJYgnagDx7JtZXhW/wNOgAtc3sl68/ gYgTADaj2w7BHdcRXHl4p9khJgf+eBRPGP9cbZ6kI31zhddxS765Nx/SwrkiIYEiAk KRBKpspnrKP/FsCe9nYBaLJzkBBtN5pFfzz5XLxY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728179AbgCZMpg (ORCPT ); Thu, 26 Mar 2020 08:45:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:47038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728134AbgCZMpg (ORCPT ); Thu, 26 Mar 2020 08:45:36 -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 3E7162073E; Thu, 26 Mar 2020 12:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585226736; bh=T3njjh52p6b6vwMAGsltE6JPsOJ6iFn2pTAXPMFbFEw=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=IDMlgWG3lnFabwznCUlcO2222T84eZfQ55i9628ivHdbWvYs5fR4PMwFgxMcH+RTH yU1tye/btJBuBjCdB101qzNnawm3KfDT7eFw2vb5Wuw/GE9+EdMsybiXeOsQ0CJSmb M4HdWwL0V0x+dgo2CmPVUSKJhr/qMf4X78UEOKiA= Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 0CDBB35226C6; Thu, 26 Mar 2020 05:45:36 -0700 (PDT) Date: Thu, 26 Mar 2020 05:45:36 -0700 From: "Paul E. McKenney" To: Greg KH Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Masahiro Yamada Subject: Re: linux-next: manual merge of the rcu tree with the spdx tree Message-ID: <20200326124535.GK19865@paulmck-ThinkPad-P72> Reply-To: paulmck@kernel.org References: <20200326141235.718118af@canb.auug.org.au> <20200326075550.GB957772@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200326075550.GB957772@kroah.com> 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 Thu, Mar 26, 2020 at 08:55:50AM +0100, Greg KH wrote: > On Thu, Mar 26, 2020 at 02:12:35PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the rcu tree got a conflict in: > > > > tools/memory-model/litmus-tests/.gitignore > > > > between commit: > > > > d198b34f3855 (".gitignore: add SPDX License Identifier") > > > > from the spdx tree and commits: > > > > 5381fb2b70e9 ("tools/memory-model: Move from .AArch64.litmus.out to .litmus.AArch.out") > > dafa02882066 ("tools/memory-model: Keep assembly-language litmus tests") > > > > from the rcu 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. > > Looks good, thanks. Works for me as well! Thanx, Paul