From owner-svn-src-head@freebsd.org  Tue Aug 11 10:52:30 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE37799E9B0;
 Tue, 11 Aug 2015 10:52:30 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
 by mx1.freebsd.org (Postfix) with ESMTP id 0B985DDA;
 Tue, 11 Aug 2015 10:52:28 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua
 [212.40.38.100])
 by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id NAA16474;
 Tue, 11 Aug 2015 13:52:20 +0300 (EEST)
 (envelope-from avg@FreeBSD.org)
Received: from localhost ([127.0.0.1])
 by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
 id 1ZP7AJ-000O2w-DS; Tue, 11 Aug 2015 13:52:19 +0300
Subject: Re: svn commit: r286625 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
To: Alexander Motin <mav@FreeBSD.org>, src-committers@FreeBSD.org,
 svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org
References: <201508111039.t7BAdK1x071658@repo.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
X-Enigmail-Draft-Status: N1110
Message-ID: <55C9D3A5.1020000@FreeBSD.org>
Date: Tue, 11 Aug 2015 13:51:17 +0300
User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101
 Thunderbird/38.1.0
MIME-Version: 1.0
In-Reply-To: <201508111039.t7BAdK1x071658@repo.freebsd.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Aug 2015 10:52:30 -0000

On 11/08/2015 13:39, Alexander Motin wrote:
> Author: mav
> Date: Tue Aug 11 10:39:19 2015
> New Revision: 286625
> URL: https://svnweb.freebsd.org/changeset/base/286625
> 
> Log:
>   MFV r277425:
>   5376 arc_kmem_reap_now() should not result in clearing arc_no_grow
>   Reviewed by: Christopher Siden <christopher.siden@delphix.com>
>   Reviewed by: George Wilson <george.wilson@delphix.com>
>   Reviewed by: Steven Hartland <killing@multiplay.co.uk>
>   Reviewed by: Richard Elling <richard.elling@richardelling.com>
>   Approved by: Dan McDonald <danmcd@omniti.com>
>   Author: Matthew Ahrens <mahrens@delphix.com>
>   
>   illumos/illumos-gate@2ec99e3e987d8aa273f1e9ba2b983557d058198c
> 
> Modified:
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Alexander,

thank you very much for bringing all these upstream changes into our tree.
It seems that some of the changes, though, non-trivially overlap with
FreeBSD-specific changes to ZFS code.  I think that this change is one
of the examples.
It would be good if a strategy of the resolution of each non-trivial
conflict was described and possibly discussed.  Reviewing the change
without knowing the general idea behind it is not always easy.

-- 
Andriy Gapon