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

[Kevin Bowling]

This doesn't answer all of your questions but one important thing to
point out is that Mateusz is in communication with the OpenZFS and iX
folks to coordinate these changes and avoid expected merge conflicts.
The idealized workflow is that a change goes into OZFS first, but as
long as folks are in agreement that can be expedited.  Once src is on
git, it is expected this type of cherry-pick in both directions will
be easier to formally define.

Regards,
Kevin

On Wed, Nov 4, 2020 at 2:36 PM Andriy Gapon <avg at freebsd.org> wrote:
>
> On 04/11/2020 23:33, Mateusz Guzik wrote:
> > 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.
>
> I certainly would, but how would I know that I should?
> Any cross-reference would be of help both now and for the future code history
> archaeology.
>
> > 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
> >>
> >
> >
>
>
> --
> Andriy Gapon
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"