Date: Tue, 16 Aug 2011 18:38:11 +0300 From: Jaakko Heinonen <jh@FreeBSD.org> To: Jonathan Anderson <jonathan@FreeBSD.org> 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... Message-ID: <20110816153810.GA2057@a91-153-123-205.elisa-laajakaista.fi> In-Reply-To: <CAMGEAwDJk=E_Qo6nT89HE=25DwQycFr9KZzqhbA_TFeOg9a_VA@mail.gmail.com> References: <201108111230.p7BCUNnS092831@svn.freebsd.org> <20110816122930.GA44017@jh> <CAMGEAwB_P1N5vgiq-uU8X4uywkhF3QGMaksTeR8R80iT43HENw@mail.gmail.com> <CAMGEAwDJk=E_Qo6nT89HE=25DwQycFr9KZzqhbA_TFeOg9a_VA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110816153810.GA2057>