From owner-svn-src-head@freebsd.org  Tue Sep 29 13:49:49 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 06B4D424431;
 Tue, 29 Sep 2020 13:49:49 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C113J5mzCz4plT;
 Tue, 29 Sep 2020 13:49:48 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com
 [209.85.222.180])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 (Authenticated sender: kevans)
 by smtp.freebsd.org (Postfix) with ESMTPSA id A650F275C7;
 Tue, 29 Sep 2020 13:49:48 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: by mail-qk1-f180.google.com with SMTP id w12so4316993qki.6;
 Tue, 29 Sep 2020 06:49:48 -0700 (PDT)
X-Gm-Message-State: AOAM532uks3D0/YO8HFuaOMndrE7XKkouRr5ib+/A0MbKZHM/mA7kF4q
 ueTf+j7ipmYlSibIhzivjH7ewvDemm67xNc+j5c=
X-Google-Smtp-Source: ABdhPJwofBmQ444BUhU+Q+DZj/XsoQRpNTd6vDFSTGSML1OTUgD2E72zzfwftUFgBbL+8xHIua5++njpbOPqRhDlo+U=
X-Received: by 2002:a05:620a:136e:: with SMTP id
 d14mr4426544qkl.430.1601387388330; 
 Tue, 29 Sep 2020 06:49:48 -0700 (PDT)
MIME-Version: 1.0
References: <202009291341.08TDflV3016426@repo.freebsd.org>
 <CACNAnaEtQm3-s4MrsOOc1CSDV3gktEzbuDP2JV611YHmd_G2uw@mail.gmail.com>
In-Reply-To: <CACNAnaEtQm3-s4MrsOOc1CSDV3gktEzbuDP2JV611YHmd_G2uw@mail.gmail.com>
From: Kyle Evans <kevans@freebsd.org>
Date: Tue, 29 Sep 2020 08:49:35 -0500
X-Gmail-Original-Message-ID: <CACNAnaHuKhdSng4Tr42vF6yEmGxips4zaNN4VS54aJ8N4=JVgg@mail.gmail.com>
Message-ID: <CACNAnaHuKhdSng4Tr42vF6yEmGxips4zaNN4VS54aJ8N4=JVgg@mail.gmail.com>
Subject: Re: svn commit: r366252 -
 head/sys/contrib/openzfs/module/os/freebsd/zfs
To: Mark Johnston <markj@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>,
 svn-src-all <svn-src-all@freebsd.org>, 
 svn-src-head <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Sep 2020 13:49:49 -0000

On Tue, Sep 29, 2020 at 8:47 AM Kyle Evans <kevans@freebsd.org> wrote:
>
> On Tue, Sep 29, 2020 at 8:42 AM Mark Johnston <markj@freebsd.org> wrote:
> >
> > Author: markj
> > Date: Tue Sep 29 13:41:47 2020
> > New Revision: 366252
> > URL: https://svnweb.freebsd.org/changeset/base/366252
> >
> > Log:
> >   ZFS: Fix a logic bug in the FreeBSD getpages VOP
> >
> >   This was introduced when I merged r361287 to OpenZFS and has been fixed
> >   there already, commit 3f6bb6e43fd68e.
> >
> >   Reported by:  swills
> >   Reviewed by:  allanjude, freqlabs, mmacy
> >
>
> I think this should have been a commit to vendor-sys/zfs/dist with an
> svn merge into sys/contrib/openzfs to make 100% sure that there's no
> merge conflict (even trivial) upon mmacy's next import, though it's
> perhaps not likely for the code to change anymore upstream and svn
> might be smart enough to realize if the diff matches. You might
> consider going ahead and committing the diff to vendor-sys and doing a
> record-only MFC of that commit into sys/contrib/openzfs.
>

Bah, sorry: "record-only MFC" -> "record-only MFV"