From owner-dev-commits-src-all@freebsd.org Mon Mar 8 18:09:44 2021 Return-Path: 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 0AAAF55187C; Mon, 8 Mar 2021 18:09:44 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DvRFM6jHSz3Fvt; Mon, 8 Mar 2021 18:09:43 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-pg1-x52f.google.com with SMTP id g4so6912342pgj.0; Mon, 08 Mar 2021 10:09:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=JrQTRO531Ui7uqvOCGhyXvQGVLx+99kZyUrsbpQ5tXs=; b=kptDXQ76cGz0APHcQKHavz93yASaKdGA15sngImEm4icklcXJ/zOUjDXsNnwU1EWDX OJdDc66ftGa4HgwRjGUIID1TgQsY0R+J0oKcP4Klln6q5On4yYmkU3WdC3NR4W23cZNQ dtFH/pDEQkcfEai+O03/TGY7ZPtutXrg6pUKghWLiLY1bAA6vkkz9T2xguAaqrVjs9gI ZbBDg9ovlJI1T1FJi8Wf+pnZcZHB8kgtxxApTWOOFetlpolHIfpizYiffs0FzNcnx92M 9QFDMHTpwCxa/vyh8UuqXbtbQPQdeqNd0dvhY5l/Ww3e82/13ysRXQ9iy4xsFQRddHEQ 1xXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=JrQTRO531Ui7uqvOCGhyXvQGVLx+99kZyUrsbpQ5tXs=; b=JmGgaKIrqUynsLBWx12NRLaptVAfrUPmSu/J7MXrGLOOGM4LXqJXDBKX9mZtw3+GQ3 4Vh/FYg9ORfrcY9uGw9W227U2mhTiZPh0gjf6Qg9NrzUuk0u6XfU9v96zNaIXhWfjEHS OGhea0MqbDed/SrVKpylIss2MTlQY4xXBCPMkzrTF9oxeHQD6afPbugMQLFqwz9BQD1C QwybXL3aoyDmu37i6jRoHTu6JlgzX7HmAGtpNsi0nD4e5rGHCR6+koA57YwVN7mbJeYH Eu2yTNRDFR9YB+eLkb46TsKNxK4UpEvJqpnlhlvCReeL4FBbNkGs5su37J22VSXKt/K1 Vcew== X-Gm-Message-State: AOAM5315cyHcAREf5I6hrvFuyelkjn/O2Lq1+N1lptfHYwACPEBBILuY Aq4TIP13cHIrbWvbaGx2Ol3lgYuUAFy53w== X-Google-Smtp-Source: ABdhPJyzaVwZm97KbN+GfDphibgAmFnxv8UOm0OAAa58zuMojAFPPqmG4HJLdt/91KIoDWJiWPQ1eQ== X-Received: by 2002:aa7:8e51:0:b029:1ed:2928:18ff with SMTP id d17-20020aa78e510000b02901ed292818ffmr80010pfr.76.1615226982363; Mon, 08 Mar 2021 10:09:42 -0800 (PST) Received: from spy (ip68-8-187-18.sd.sd.cox.net. [68.8.187.18]) by smtp.gmail.com with ESMTPSA id g22sm52824pju.30.2021.03.08.10.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 10:09:41 -0800 (PST) Sender: Mark Johnston Date: Mon, 8 Mar 2021 14:10:42 -0500 From: Mark Johnston To: Kyle Evans Cc: src-committers , "" , dev-commits-src-main@freebsd.org Subject: Re: git: 1bb7c45c532f - main - wg: Fix a mismerge Message-ID: References: <202103081758.128Hw05O070057@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DvRFM6jHSz3Fvt X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2021 18:09:44 -0000 On Mon, Mar 08, 2021 at 12:05:37PM -0600, Kyle Evans wrote: > On Mon, Mar 8, 2021 at 11:58 AM Mark Johnston wrote: > > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1bb7c45c532f3de76120db05739ac4ee34403091 > > > > commit 1bb7c45c532f3de76120db05739ac4ee34403091 > > Author: Mark Johnston > > AuthorDate: 2021-03-08 17:56:14 +0000 > > Commit: Mark Johnston > > 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. It's my fault, I saw your commit before I pushed and amended the commit log message accordingly, but then failed to actually update the diff. :/