From owner-svn-src-all@FreeBSD.ORG  Tue Aug 16 15:38:18 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7DD181065673;
	Tue, 16 Aug 2011 15:38:18 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from gw03.mail.saunalahti.fi (gw03.mail.saunalahti.fi
	[195.197.172.111])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E7728FC0C;
	Tue, 16 Aug 2011 15:38:17 +0000 (UTC)
Received: from a91-153-123-205.elisa-laajakaista.fi
	(a91-153-123-205.elisa-laajakaista.fi [91.153.123.205])
	by gw03.mail.saunalahti.fi (Postfix) with SMTP id 4D6DE216AAB;
	Tue, 16 Aug 2011 18:38:11 +0300 (EEST)
Date: Tue, 16 Aug 2011 18:38:11 +0300
From: Jaakko Heinonen <jh@FreeBSD.org>
To: Jonathan Anderson <jonathan@FreeBSD.org>
Message-ID: <20110816153810.GA2057@a91-153-123-205.elisa-laajakaista.fi>
References: <201108111230.p7BCUNnS092831@svn.freebsd.org>
	<20110816122930.GA44017@jh>
	<CAMGEAwB_P1N5vgiq-uU8X4uywkhF3QGMaksTeR8R80iT43HENw@mail.gmail.com>
	<CAMGEAwDJk=E_Qo6nT89HE=25DwQycFr9KZzqhbA_TFeOg9a_VA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAMGEAwDJk=E_Qo6nT89HE=25DwQycFr9KZzqhbA_TFeOg9a_VA@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, Robert Watson <rwatson@freebsd.org>
Subject: Re: svn commit: r224778 - in head: sys/amd64/linux32
 sys/cddl/compat/opensolaris/sys sys/compat/freebsd32 sys/compat/linux
 sys/compat/svr4 sys/dev/aac sys/dev/amr sys/dev/hwpmc sys/dev/ipmi
 sys/dev/isc...
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Aug 2011 15:38:18 -0000

On 2011-08-16, Jonathan Anderson wrote:
> Fixed in r224911.

Thanks!

> On 16 August 2011 14:57, Jonathan Anderson <jonathan@freebsd.org> wrote:
> > It looks like r224086 added "goto out" error handling, so our "return
> > (error)" seems to be a merge conflict.

-- 
Jaakko