svn commit: r367343 - in head/sys/contrib/openzfs/include/os: freebsd/zfs/sys linux/zfs/sys

[Mateusz Guzik]

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 at 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>