From owner-freebsd-stable@FreeBSD.ORG Sun Oct 30 21:43:50 2011 Return-Path: Delivered-To: stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0660F106566C for ; Sun, 30 Oct 2011 21:43:50 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (unknown [IPv6:2a01:4f8:150:6101::4]) by mx1.freebsd.org (Postfix) with ESMTP id BCAE98FC14 for ; Sun, 30 Oct 2011 21:43:49 +0000 (UTC) Received: from core2.vx.sk (localhost [127.0.0.2]) by mail.vx.sk (Postfix) with ESMTP id 27474EC2B; Sun, 30 Oct 2011 22:43:49 +0100 (CET) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by core2.vx.sk (amavisd-new, unix socket) with LMTP id 6NASg2HKfD1n; Sun, 30 Oct 2011 22:43:47 +0100 (CET) Received: from [10.9.8.1] (188-167-78-15.dynamic.chello.sk [188.167.78.15]) by mail.vx.sk (Postfix) with ESMTPSA id 0CF95EC22; Sun, 30 Oct 2011 22:43:47 +0100 (CET) Message-ID: <4EADC513.5080206@FreeBSD.org> Date: Sun, 30 Oct 2011 22:43:47 +0100 From: Martin Matuska User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: Jason Hellenthal References: <201110302103.p9UL3Cej084788@svn.freebsd.org> <20111030213419.GA56708@DataIX.net> In-Reply-To: <20111030213419.GA56708@DataIX.net> X-Enigmail-Version: 1.3.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: stable@freebsd.org Subject: Re: svn commit: r226946 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 21:43:50 -0000 On 30. 10. 2011 22:34, Jason Hellenthal wrote: > On Sun, Oct 30, 2011 at 09:03:12PM +0000, Martin Matuska wrote: >> Author: mm >> Date: Sun Oct 30 21:03:12 2011 >> New Revision: 226946 >> URL: http://svn.freebsd.org/changeset/base/226946 >> >> >> Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c >> ============================================================================== >> --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Oct 30 21:02:01 2011 (r226945) >> +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Oct 30 21:03:12 2011 (r226946) >> @@ -21,6 +21,9 @@ >> /* >> * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. >> */ >> +/* >> + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. >> + */ >> > With (c) being a literal copyright symbol it seems to be missing above. Hi Jason, this is a 1:1 upstream merge: http://hg.openindiana.org/upstream/illumos/illumos-gate/file/205481e35e49/usr/src/uts/common/fs/zfs/dmu_tx.c If you don't like it you can try to contact Illumos and/or Nexenta ;-) -- Martin Matuska FreeBSD committer http://blog.vx.sk