Bump version and add notice about incompatibility introduced by resumable

send/receive support in ZFS.

diff --git a/UPDATING b/UPDATING
index baff1f13605bb38393cac3229ae2ae0793d4c3bc..12631e1908414f09d7f89f59158612ef728bc9af 100644 (file)
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
        disable the most expensive debugging functionality run
        "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20151015:
+       Added ZFS support for resumable send/receive changed respective
+       IOCTL API/ABI.  Compatibility ABI shims were provided for other
+       functionality, while receive require version match between world
+       and kernel.
+
 20151012:
        If you specify SENDMAIL_MC or SENDMAIL_CF in make.conf, mergemaster
        and etcupdate will now use this file. A custom sendmail.cf is now

diff --git a/sys/sys/param.h b/sys/sys/param.h
index 67c525f7a3482df2a1e460d79db2ee2f9e3e3c53..25870c321c9afa460d5943c8a809e04fba09ea64 100644 (file)
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
  *             in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100080      /* Master, propagated to newvers */
+#define __FreeBSD_version 1100081      /* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,