From owner-svn-src-all@freebsd.org Thu Mar 5 06:22:25 2020 Return-Path: Delivered-To: svn-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 2C81A25EC48 for ; Thu, 5 Mar 2020 06:22:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 48Y0z30Xsjz4g1B for ; Thu, 5 Mar 2020 06:22:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2a.google.com with SMTP id u10so1957873qvi.2 for ; Wed, 04 Mar 2020 22:22:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=prz+FsTWzjW2Rgv/cVl0SSuw13Q6XGThwggNKEcv9Jw=; b=gqPpHjtoL3SmvNHQeVWd6dbeFx5/Rdf/5UkbMLO7dgAd8YTfuBSNf+gKJm3/327vuq 3EOwqOsSFw2aNhWSepHvcyYffY2BWoNcxZ4uFM/NiC3iQrSDrdvTQyItut5+sGiJ4psP tGh1uLkFOp78it8RpS46p0HK8/jJAAHV1RP+OdZtCOZXVIFX8x87pbSOUJozpeNHCsne oEHHWFTbm+NiTHlidYUBOyvNXZVb8xS5sdSWtQwMytqzVjsNlLuRB5LDlRfSQUkJoOPb OoeGtQAzntnNX8TuYYB0jrqA2Pu9l2gzqrV7cP97A12hwD5i50eHkLkLKwNkJdi2mkfS GebQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=prz+FsTWzjW2Rgv/cVl0SSuw13Q6XGThwggNKEcv9Jw=; b=cmDxgPdhVyD7uSUVRLTmT2k9ALJ5DiC2/a7G2fPkKUDZ+Bs/slaL57OFW3gxl08II/ QYtopnOXp7CwlDRIkhyh4lY+DPPoEr+Yan/TtnWxgB1jiOPESb7HjYbMlYsGN2DfaZFZ P2K9ThQdAy91jzDmZg9BNgwSE5y0X0XRDbWm9KykU5yaqQ4hEsn7BMK7BsJCGB+LFFEN RraCUxF0r3kNuXNhhagGIj611mqXLxHYqAxVbRocGpVazV52+tIf52IjrVxYhSNRbNMd r0timfBIzO1J8bcw6sU64S+OG6nUMF2yZIML3WGsGa6gNk1YFS6Kn2Mdvu8tmJdN2zy/ UclA== X-Gm-Message-State: ANhLgQ2A2OLUSkuIpl8zscE69fmjZxVjTKzEe26ynqLRdodVZE3ZcWrv wcBRHGiiflHMxk+Wvs4wIKXzO/DbgDngbCM/gDglRWxB X-Google-Smtp-Source: ADFU+vtpfob1gM0l8mFuZyBm+/CPVTPPXEVxu2UL3jvYqfn7H4BBXuJKKgyCYBovDADr6DIVwtZ2FkpKOVav6jaYZjs= X-Received: by 2002:a0c:e982:: with SMTP id z2mr5026603qvn.22.1583389340803; Wed, 04 Mar 2020 22:22:20 -0800 (PST) MIME-Version: 1.0 References: <201904071839.x37IduPO002007@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 4 Mar 2020 23:22:10 -0700 Message-ID: Subject: Re: svn commit: r346018 - head/sys/conf To: Alan Somers Cc: Warner Losh , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 48Y0z30Xsjz4g1B X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=gqPpHjto; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.67 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[a.2.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-1.67)[ip: (-4.77), ipnet: 2607:f8b0::/32(-1.86), asn: 15169(-1.66), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2020 06:22:25 -0000 On Wed, Mar 4, 2020 at 10:27 PM Alan Somers wrote: > On Sun, Apr 7, 2019 at 12:40 PM Warner Losh wrote: > >> Author: imp >> Date: Sun Apr 7 18:39:55 2019 >> New Revision: 346018 >> URL: https://svnweb.freebsd.org/changeset/base/346018 >> >> Log: >> Use default shell assignment rather more complicated if then >> construct. >> >> Discussed with: emaste@, allanjude@ (changes (or not) based on their >> feedback) >> Differential Revision: https://reviews.freebsd.org/D19797 >> > > Can we MFC this to stable/12? Before this change, setting BRANCH_OVERRIDE > during "make release" would have no effect. > Sure thing. There was a merge conflict, which makes sense, but I think I resolved it correctly. Warner