Diffusion FreeBSD src repository 4b84b4cca472

zfs: fix non-functional mismerges from vendor/openzfs
4b84b4cca472
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

zfs: fix non-functional mismerges from vendor/openzfs

fix copyright in module/os/freebsd/spl/spl_acl.c
fix mismerge in non-processed module/os/linux/zfs/zfs_uio.c

MFC after: 3 days
Obtained from: OpenZFS

Details

Provenance

mm	Authored on Apr 26 2021, 1:05 AM

Parents

rGaad780464fad: nfscl: return delegations in the NFS VOP_RECLAIM()

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rG4b84b4cca472: zfs: fix non-functional mismerges from vendor/openzfs (authored by mm).Apr 26 2021, 1:05 AM

mm mentioned this in rG9f1dc86c46d6: zfs: restore copyright disclaimer change from 4b84b4cca.Apr 26 2021, 8:17 PM

Changes (2)

Path

Size

sys/

contrib/

openzfs/

module/

os/

freebsd/

spl/

linux/

zfs/

rG4b84b4cca472

sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c

Loading...