svn commit: r366252 - head/sys/contrib/openzfs/module/os/freebsd/zfs

[Kyle Evans]

On Tue, Sep 29, 2020 at 9:04 AM Mark Johnston <markj at 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 at 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!