]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e81b1bd) | patch
zfs: Fix an improperly resolved merge conflict
authorMark Johnston <markj@FreeBSD.org>
Tue, 1 Nov 2022 20:54:33 +0000 (16:54 -0400)
committerMark Johnston <markj@FreeBSD.org>
Tue, 1 Nov 2022 20:55:10 +0000 (16:55 -0400)
commitc3c13035ef270dcf0d24d2d847dd590edc535ed0
treef6582d69009a70d8ae8b52e00da4cabe6d159fb7tree | snapshot
parente81b1bd17fb4e83865d60461c2554d90f72cd395commit | diff
zfs: Fix an improperly resolved merge conflict

Approved by: so
Fixes: 8838c650cb59 ("Fix use-after-free in btree code")
sys/contrib/openzfs/module/zfs/btree.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.