From owner-dev-commits-src-all@freebsd.org  Mon Mar  8 18:05:51 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id F05AD551AC0;
 Mon,  8 Mar 2021 18:05:51 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DvR8v6Vtnz3Fb0;
 Mon,  8 Mar 2021 18:05:51 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com
 [209.85.160.177])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 (Authenticated sender: kevans)
 by smtp.freebsd.org (Postfix) with ESMTPSA id CB766C5B2;
 Mon,  8 Mar 2021 18:05:51 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: by mail-qt1-f177.google.com with SMTP id d11so8177460qtx.9;
 Mon, 08 Mar 2021 10:05:51 -0800 (PST)
X-Gm-Message-State: AOAM533JEUi08ds6cl2/MoqLWiZpmawy7/+D8LmjIRit9bCqPZPpB5WV
 UHvkyzMHC9Y5NQoAbPlhQ80dhL/+NGpnxnLeH2g=
X-Google-Smtp-Source: ABdhPJzT+d0wNTAnOrTQGBB9R6xWOWDJXpEDsa3N47V2n+KB7WIxx7vV/Am4IXyeKuzNRtS3Hojm1fiq0Ofo5cMB+4k=
X-Received: by 2002:ac8:5947:: with SMTP id 7mr21872974qtz.60.1615226751399;
 Mon, 08 Mar 2021 10:05:51 -0800 (PST)
MIME-Version: 1.0
References: <202103081758.128Hw05O070057@gitrepo.freebsd.org>
In-Reply-To: <202103081758.128Hw05O070057@gitrepo.freebsd.org>
From: Kyle Evans <kevans@freebsd.org>
Date: Mon, 8 Mar 2021 12:05:37 -0600
X-Gmail-Original-Message-ID: <CACNAnaHwD=+OQyMg7umYLoWjiKqBnRGuRt5oDpOrLxgstTnB3g@mail.gmail.com>
Message-ID: <CACNAnaHwD=+OQyMg7umYLoWjiKqBnRGuRt5oDpOrLxgstTnB3g@mail.gmail.com>
Subject: Re: git: 1bb7c45c532f - main - wg: Fix a mismerge
To: Mark Johnston <markj@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>, 
 "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>,
 dev-commits-src-main@freebsd.org
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: dev-commits-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the src repository
 <dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>, 
 <mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>, 
 <mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Mar 2021 18:05:52 -0000

On Mon, Mar 8, 2021 at 11:58 AM Mark Johnston <markj@freebsd.org> wrote:
>
> The branch main has been updated by markj:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=1bb7c45c532f3de76120db05739ac4ee34403091
>
> commit 1bb7c45c532f3de76120db05739ac4ee34403091
> Author:     Mark Johnston <markj@FreeBSD.org>
> AuthorDate: 2021-03-08 17:56:14 +0000
> Commit:     Mark Johnston <markj@FreeBSD.org>
> CommitDate: 2021-03-08 17:56:14 +0000
>
>     wg: Fix a mismerge
>
>     df55485085 fixed a leak that I had initially fixed in a11009dccb.
>
>     Fixes:  a11009dccb

Whoops, sorry about that. :-( I didn't check for conflicting work here.