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=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 F17A2C2D0E2 for ; Thu, 24 Sep 2020 14:31:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B00892220D for ; Thu, 24 Sep 2020 14:31:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=intel-com.20150623.gappssmtp.com header.i=@intel-com.20150623.gappssmtp.com header.b="zQFEGHjU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728256AbgIXObd (ORCPT ); Thu, 24 Sep 2020 10:31:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728088AbgIXObc (ORCPT ); Thu, 24 Sep 2020 10:31:32 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D365C0613D3 for ; Thu, 24 Sep 2020 07:31:32 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id z22so4787847ejl.7 for ; Thu, 24 Sep 2020 07:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=odhMshJGjGRGkncEgkE0TiVhjyT1V5xcM/UN8xcWlk4=; b=zQFEGHjU8PSYvc/cGGcdRSCXMSYcEXRRFLXlPxuLiPG1IdULSV2BWPQrVxcadmR2pN eP/eLf/175tPVgojsaSO7q4jtEWLKZLFUKgnYNYgzXsha22gu0phMArGUEUk2o2U3vMt /C9ctYMJz2lmj+vjABIr/PAvZK3U4q5blS3ZgYgP3Yb9sAkkBh6ToH7wtxLo4Ahel50V kGA2XTsY7suzd+kK3euJrgSK/YfoAMVldk5bFAuKgJDP7TU6NjXlGaA5FPbWY7GH+ZB2 HUGSTjq0GI64ZlzlSP9GCSSFololq6GDyKcX9LhCfzqMoJ4K3EdipwVhkw5RwyPnAbh3 Pdow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=odhMshJGjGRGkncEgkE0TiVhjyT1V5xcM/UN8xcWlk4=; b=pR8R9OBlGZyf77G9kQ6Ua+RKkIHMvv+OGrlU9kquCo7uc9qlVTlBJ+hAYZl3KdPMyD VhqvgrkgQ1hPeTI80TrJU8sMSrRmaVCMoZjbijn6LeOqx0jxi0Qd3r0yMByxM1fEUc5x 6NxK98ysG604Aod3Y0CSzw2GsZZp1bPDxWLbxWRKS7Y2I7GqvUbNZB5ZDo0fqeFcwjMR 3gK9z/S3doIG2HsNWWAII0c3WtTxA6wDAETM03oK6D5qRs22iaCcD1vQbVWjuCt0prrP QiUV2ajqM4XK+pAK4P28EEDgTyTh37zkQ8o58InhWTVr9gWbPiYMcWwF12rWyq68AHlN NFng== X-Gm-Message-State: AOAM531GwbkriYQ7zYL4YBG/CqH6hhg0LjIq6LYlG/iDVD7m0xUqyOVK 13xIaN/QULhZX1HyEECZuO/GDqfSXOyCzMC2NZKIfd8gOgs= X-Google-Smtp-Source: ABdhPJytdILVnAZpcUfqna+99yzNyKUHkkoDhdW6cGK3PRDmE1fD566jjwMJcMiVOrrInsFO9ddJQ0lpRRRvL/cE+EU= X-Received: by 2002:a17:906:8143:: with SMTP id z3mr146237ejw.323.1600957890033; Thu, 24 Sep 2020 07:31:30 -0700 (PDT) MIME-Version: 1.0 References: <20200924164529.61ea980f@canb.auug.org.au> In-Reply-To: From: Dan Williams Date: Thu, 24 Sep 2020 07:31:18 -0700 Message-ID: Subject: Re: linux-next: manual merge of the nvdimm tree with the vfs tree To: Stephen Rothwell Cc: Al Viro , Josh Poimboeuf , Vishal Verma , Linux Next Mailing List , Linux Kernel Mailing List , Ingo Molnar Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ add Ingo ] On Thu, Sep 24, 2020 at 7:10 AM Dan Williams wrote: > > On Wed, Sep 23, 2020 at 11:45 PM Stephen Rothwell wrote: > > > > Hi all, > > > > Today's linux-next merge of the nvdimm tree got a conflict in: > > > > lib/iov_iter.c > > > > between commit: > > > > e33ea6e5ba6a ("x86/uaccess: Use pointer masking to limit uaccess speculation") > > > > from the vfs tree and commit: > > > > 0a78de3d4b7b ("x86, powerpc: Rename memcpy_mcsafe() to copy_mc_to_{user, kernel}()") > > > > from the nvdimm tree. > > > > I fixed it up (I just used the latter, but I suspect that more work is > > needed) 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. > > I messed up, this shouldn't be present in -next, yet. Will remove. Oh, wait, this isn't from a new push this was back from the v5.9 merge attempt and is only just now causing conflicts. Ingo, how does tip.git usually coordinate with vfs.git? Should I rebase on vfs / work the copy_mc_to_{user,kernel} patches through Al, or?