From owner-svn-src-head@freebsd.org  Tue Sep 29 14:06: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 1DFA342465A;
 Tue, 29 Sep 2020 14:06:49 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (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 4C11Qw742xz4qnZ;
 Tue, 29 Sep 2020 14:06:48 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com
 [209.85.222.182])
 (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 D054027347;
 Tue, 29 Sep 2020 14:06:48 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: by mail-qk1-f182.google.com with SMTP id f142so4369970qke.13;
 Tue, 29 Sep 2020 07:06:48 -0700 (PDT)
X-Gm-Message-State: AOAM531z8C5BaR/v8EsnBuiJvN0UiyJF457Ro8AyASpNuN0b3d8A4D+G
 SVTTRBqcgXBf9fc0h8v+Du3JEv6TC7854A3Nvnc=
X-Google-Smtp-Source: ABdhPJyMTIPq+iyCy5+MvFTD02XVHtzNGp9TKWQgqzoaP04ze7PnL9pjFwFVsjyyGkj+MX2XO6O9Pg0NWrDGjkUQSp0=
X-Received: by 2002:a37:a189:: with SMTP id k131mr4411666qke.34.1601388408452; 
 Tue, 29 Sep 2020 07:06:48 -0700 (PDT)
MIME-Version: 1.0
References: <202009291341.08TDflV3016426@repo.freebsd.org>
 <CACNAnaEtQm3-s4MrsOOc1CSDV3gktEzbuDP2JV611YHmd_G2uw@mail.gmail.com>
 <20200929140440.GC26914@raichu>
In-Reply-To: <20200929140440.GC26914@raichu>
From: Kyle Evans <kevans@freebsd.org>
Date: Tue, 29 Sep 2020 09:06:33 -0500
X-Gmail-Original-Message-ID: <CACNAnaH_Zxuf7Kb=Exh2OuDUZOSxP7qPWoLHGEV3H+V+UfbM0g@mail.gmail.com>
Message-ID: <CACNAnaH_Zxuf7Kb=Exh2OuDUZOSxP7qPWoLHGEV3H+V+UfbM0g@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 14:06:49 -0000

On Tue, Sep 29, 2020 at 9:04 AM Mark Johnston <markj@freebsd.org> wrote:
>
> On Tue, Sep 29, 2020 at 08:47:37AM -0500, Kyle Evans 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.
>
> Done in r366254.

Excellent, thanks!