From 632a242e8352f0a4684f41286a288689f97e504b Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Mon, 7 Oct 2013 06:53:58 -0400 Subject: [PATCH] Add missing copyright notices from Illumos This resolves merge conflicts when merging Illumos #3588 and Illumos #4047. Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Issue #1775 --- include/sys/dmu.h | 1 + module/zcommon/zfs_prop.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/sys/dmu.h b/include/sys/dmu.h index fd1460d5c4..60d4aa58ab 100644 --- a/include/sys/dmu.h +++ b/include/sys/dmu.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index 722995dc51..7e3563285c 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. */ /* Portions Copyright 2010 Robert Milkowski */