From owner-freebsd-stable@FreeBSD.ORG Mon Oct 31 17:05:19 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 36DB01065678; Mon, 31 Oct 2011 17:05:19 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by mx1.freebsd.org (Postfix) with ESMTP id D07CF8FC16; Mon, 31 Oct 2011 17:05:18 +0000 (UTC) Received: by gyb11 with SMTP id 11so2099635gyb.13 for ; Mon, 31 Oct 2011 10:05:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to; bh=waLYKBqSbYE6QJ0pivxe4GkO54UgeaV9XQJ0FtdI99M=; b=r76/eEkb+SBaLAVAL4qNdb3Gbf7OGD4HuhQoAvtVInMhBEcS2MwruhGNqHbsAvG2n+ XDrutjrgCmXJNgIpk4nrB+BTiXTMeC1NvHWY7QUG+J/qWf2pCODnKHeAZfGNW6bpk5yT rc/KpzQ+MgzvOSH7i7bQLa3+ouFpZk7QiWO08= Received: by 10.236.108.225 with SMTP id q61mr17830539yhg.66.1320080717923; Mon, 31 Oct 2011 10:05:17 -0700 (PDT) Received: from DataIX.net (adsl-99-181-134-232.dsl.klmzmi.sbcglobal.net. [99.181.134.232]) by mx.google.com with ESMTPS id r9sm53409678anh.8.2011.10.31.10.05.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 31 Oct 2011 10:05:15 -0700 (PDT) Sender: Jason Hellenthal Received: from DataIX.net (localhost.DataIX.local [127.0.0.1]) by DataIX.net (8.14.5/8.14.5) with ESMTP id p9VH5CfJ047247 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 31 Oct 2011 13:05:12 -0400 (EDT) (envelope-from jhell@DataIX.net) Received: (from jhell@localhost) by DataIX.net (8.14.5/8.14.5/Submit) id p9VH5CK9047246; Mon, 31 Oct 2011 13:05:12 -0400 (EDT) (envelope-from jhell@DataIX.net) Date: Mon, 31 Oct 2011 13:05:12 -0400 From: Jason Hellenthal To: Martin Matuska Message-ID: <20111031170511.GA42662@DataIX.net> References: <201110302103.p9UL3Cej084788@svn.freebsd.org> <20111030213419.GA56708@DataIX.net> <4EADC513.5080206@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4EADC513.5080206@FreeBSD.org> 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: Mon, 31 Oct 2011 17:05:19 -0000 On Sun, Oct 30, 2011 at 10:43:47PM +0100, Martin Matuska wrote: > 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 ;-) > Haha ok, I will get right on that ;). Thought this was just added to that that file.