merge conflict in dsl_scan.c:
```<<<<<<< HEAD
/* Embedded BP's have phys_birth==0, so we reject them above. */
ASSERT(!BP_IS_EMBEDDED(bp));
f (BP_IS_EMBEDDED(bp)) {
count_block(scn, dp->dp_blkstats, bp);
return (0);
}
>>>>>>> My attempt to port the FreeBSD sequential scan changes (themselves
```
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/openzfs/openzfs/pull/642#issuecomment-395787279
------------------------------------------
openzfs: openzfs-developer
Permalink:
https://openzfs.topicbox.com/groups/developer/T6b1e5de580958224-M96d9954c393c708471d5f50e
Delivery options: https://openzfs.topicbox.com/groups
