Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Nov 2020 22:33:40 +0100
From:      Mateusz Guzik <mjguzik@gmail.com>
To:        Andriy Gapon <avg@freebsd.org>
Cc:        src-committers@freebsd.org, svn-src-all@freebsd.org,  svn-src-head@freebsd.org, Matt Macy <mmacy@freebsd.org>
Subject:   Re: svn commit: r367343 - in head/sys/contrib/openzfs/include/os: freebsd/zfs/sys linux/zfs/sys
Message-ID:  <CAGudoHH%2BsCs1OxWP38%2BeQ_AtqULV0qhpk8ycqKp8p2xcz1DShQ@mail.gmail.com>
In-Reply-To: <4cecdc18-e9e9-4319-2502-e8c69a94aba5@FreeBSD.org>
References:  <202011042118.0A4LIq3H077210@repo.freebsd.org> <4cecdc18-e9e9-4319-2502-e8c69a94aba5@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Well, should you check OpenZFS github you will find I post pull
request there as well. So whatever conflicts arise for people merging
stuff back are to be just whacked in favor in what's in upstream.

On 11/4/20, Andriy Gapon <avg@freebsd.org> wrote:
> On 04/11/2020 23:18, Mateusz Guzik wrote:
>> Author: mjg
>> Date: Wed Nov  4 21:18:51 2020
>> New Revision: 367343
>> URL: https://svnweb.freebsd.org/changeset/base/367343
>>
>> Log:
>>   zfs: add branch prediction to ZFS_ENTER and ZFS_VERIFY_ZP macros
>>
>>   They are expected to fail only in corner cases.
>>
>> Modified:
>>   head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h
>>   head/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_znode_impl.h
>
> Picking a random commit of many, is this how we do ZFS/OpenZFS changes now?
> Can I do the same?
> Who will be resolving any merge conflicts resulting from my changes?
>
> --
> Andriy Gapon
>


-- 
Mateusz Guzik <mjguzik gmail.com>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGudoHH%2BsCs1OxWP38%2BeQ_AtqULV0qhpk8ycqKp8p2xcz1DShQ>