summaryrefslogtreecommitdiffstats
path: root/contrib/diff/src/diff3.c
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2016-10-14 07:43:28 +0000
committermav <mav@FreeBSD.org>2016-10-14 07:43:28 +0000
commit5329a3ac7319f1769eafe7eb97255278279a1ce1 (patch)
tree04f11ae897149d8116f61826d750c2d3baa88858 /contrib/diff/src/diff3.c
parent0504468b1f136e7dbc17ed6602c4abd75255fb0c (diff)
downloadFreeBSD-src-5329a3ac7319f1769eafe7eb97255278279a1ce1.zip
FreeBSD-src-5329a3ac7319f1769eafe7eb97255278279a1ce1.tar.gz
MFC r305456 (by avg): fix zfs pool creation accidentally broken by r305331
The upstream change introduced a new load state, SPA_LOAD_CREATE, and vdev_geom code needs to be aware of it.
Diffstat (limited to 'contrib/diff/src/diff3.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud