Andriy Gapon 4b040d9513 zfs: fixes for a full stream received into an existing dataset ...

- this should fail early unless the force flag is set
- if the force flag is set then any local modifications including
  snapshots should be undone

See:	https://www.illumos.org/issues/5912
See:	https://reviews.csiden.org/r/220/

Reviewed by:	mahrens, Paul Dagnelie <pcd@delphix.com>
MFC after:	15 days
Sponsored by:	ClusterHQ

2015-05-25 11:56:57 +00:00

..

boot/zfs

MFV r274273:

2014-11-10 08:20:21 +00:00

compat/opensolaris

Add the arm64 defines for cddl code.

2015-04-01 08:31:56 +00:00

contrib/opensolaris

zfs: fixes for a full stream received into an existing dataset

2015-05-25 11:56:57 +00:00

dev

Remove unused references to calltrap.

2015-05-25 01:22:56 +00:00