From owner-svn-src-all@freebsd.org Sat Dec 28 05:34:34 2019 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 98CD51DB814 for ; Sat, 28 Dec 2019 05:34:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 47lC7F4r9Mz3Gjr for ; Sat, 28 Dec 2019 05:34:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72f.google.com with SMTP id j9so23301365qkk.1 for ; Fri, 27 Dec 2019 21:34:33 -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=CQjoHHfmkEK+VEv0eqIqJaLSd4fncDsVwXDyT5ma/Qo=; b=erjN76b7sboIKwQv1ygrwLGGkCx/aKOL/OQiChs6Edc694M/G6C+xru4ggxcfTczPp 7uw0gdD1lG1/WNkhN7Az3KJlbanKZMpMLoBWI2gTOl0qxTvkvz2+lmQd+V360uifd9dj Mw6ZzlaZwb6rxKJTE2nU6tCvMk8B+kXlgs603KVVRsYYvYwndPJ9q0D5UWwpk7h9pJ5t QsPg6XcDkCAjuReKFU2KD9f3bSNMMqRKI25XDeKwlF85bkMzm7kBzwV7YWaNek2vvWv3 p/AKk0tM6TA2ogNftxeLp1uQrgHyJZkkcyNhPy26Ze16dLYhQ4ZF2m9GyWiFl6An6ZWm 3wqA== 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=CQjoHHfmkEK+VEv0eqIqJaLSd4fncDsVwXDyT5ma/Qo=; b=b7G87bH0+UY9ioeufsiMuaDdlaZbupdJJWR5QCcEwY1Q1mPGWkFP4y3HK4QKCJFKbe GAEH11WKA1uNsxqtAjgYUhYcRApzo1Rw217Qb8sG00He9+UlvdppeIH1P+fk8qOHgmmg NetE9fQQWaW4k3hlz7zY+19fdRXeySQnW4s+xXfpx2EA3W2JcK/cjxFAIk1R1qiL/WtS bozrlVl5vVS8e9N7RPwBTiWayCjHAwXfYpTAGNnP7hha2IgHlHQ8OG0cVXX8F6KVHaqD k2gAqwaLp6UeUh6iKxtZEKZwfrso8RPuVDpt9YGg/6E4Qszen7E+j4TOfNzd5gc67pj7 xw4A== X-Gm-Message-State: APjAAAVvx/vVGcQx9Q9JKco+VtMbz4ZBeS5ZnN1NSvyPx9cXQK9jeFBr uLGyo3xwAwiQpSkNFreSCab4Ec2cUjoVIc8yMhPKGA== X-Google-Smtp-Source: APXvYqyBEHhZVETipntqBgQJV3uiNQfHnKMP3qW60WDydxYT/nCLPlEg1goyVb1URStVzSqob7BMOkEmGca1UE222rc= X-Received: by 2002:a05:620a:795:: with SMTP id 21mr46854552qka.60.1577511272591; Fri, 27 Dec 2019 21:34:32 -0800 (PST) MIME-Version: 1.0 References: <62fe2914-91fd-96ba-5953-57fa43dfe775@FreeBSD.org> <201912280527.xBS5R8fk041737@gndrsh.dnsmgr.net> In-Reply-To: <201912280527.xBS5R8fk041737@gndrsh.dnsmgr.net> From: Warner Losh Date: Fri, 27 Dec 2019 22:34:21 -0700 Message-ID: Subject: Re: svn commit: r356142 - in head/sys: dev/ofw sys To: "Rodney W. Grimes" Cc: Pedro Giffuni , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 47lC7F4r9Mz3Gjr X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=erjN76b7; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72f) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.69 / 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)[f.2.7.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(-2.69)[ip: (-9.37), ipnet: 2607:f8b0::/32(-2.15), asn: 15169(-1.88), 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: Sat, 28 Dec 2019 05:34:34 -0000 On Fri, Dec 27, 2019 at 10:27 PM Rodney W. Grimes wrote: > > > > You can choose your own license for original work, sure, but > obliterating > > > parts of an existing license by applying a second license which is in > > > conflict is probably a poor idea. > > > > > > We don't do that at all: pretty clearly there is no conflict between > > both licenses as you can comply with both. > > The only way to comply with both is to comply with the full 4 > clause license. Hense the 2 clause is pointless in being there > and can never apply until all 4 clause authors agree to change > to 2 clause. > Until such time as Jeff finishes rewriting the files, then we just nerf the 4 clause one as no longer relevant since it describes no code in the file anymore... We've done exactly the thing Jeff did hundreds if not thousands of times already in the project in code spanning at least the last 25 or so years... Not sure why it's coming up now over an annotation that has a specific meaning that's clear and well defined. Warner