Date: Fri, 08 Nov 2019 13:42:33 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: rgrimes@freebsd.org, "Rodney W. Grimes" <freebsd@gndrsh.dnsmgr.net>, Glen Barber <gjb@freebsd.org> Cc: Mark Johnston <markj@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r350089 - head Message-ID: <E5CA313F-6D73-4058-AD6C-2FB940A398A4@cschubert.com> In-Reply-To: <201911081826.xA8IQIUn021142@gndrsh.dnsmgr.net> References: <201911081826.xA8IQIUn021142@gndrsh.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Those were my initial thoughts at the time=2E If an MFC is performed, its a= ssociated RELNOTES should also be committed=2E If committing an MFC, it mak= es sense to commit the same RELNOTES text through an MFC as well=2E On November 8, 2019 11:26:18 AM MST, "Rodney W=2E Grimes" <freebsd@gndrsh= =2Ednsmgr=2Enet> wrote: >> On Wed, Jul 17, 2019 at 07:09:06PM +0000, Mark Johnston wrote: >> > Author: markj >> > Date: Wed Jul 17 19:09:05 2019 >> > New Revision: 350089 >> > URL: https://svnweb=2Efreebsd=2Eorg/changeset/base/350089 >> >=20 >> > Log: >> > Add an initial RELNOTES file=2E >> > =20 >> > The intent is to provide a convenient location to document >changes >> > that are relevant to users of binary FreeBSD distributions, in >contrast >> > with UPDATING, which exists to document caveats for users who >build >> > FreeBSD from source=2E >> > =20 >> > This complements the "Relnotes:" tag in commit messages by >providing a >> > place to document the change in more detail, or in case a >"Relnotes:" >> > tag was accidentally omitted=2E In particular, "Relnotes:" should >be >> > used if you do not intend to document the change in RELNOTES for >some >> > reason=2E >> > =20 >> > Changes to the file should not be MFCed=2E For now the file will >exist >> > only in head, but may be updated via direct commits to stable >branches >> > depending on how things go=2E >> > =20 >>=20 >> I had to go look at the original thread to remind myself about this, >but >> regarding not MFCing changes from head to stable branches, I think >there >> may have been some confusion in the discussion=2E >>=20 >> By "changes should not be MFCed", at least based on my recollection >of >> how the conversation was going, I (at least) meant "not MFCed, but >> committed as a direct commit to stable branches=2E" In other words, >> merging the RELNOTES change from head to stable/X does not really >make >> sense, as the revision numbers will have changed, and would >inevitably >> cause merge conflicts=2E >>=20 >> Now that 12=2E1 is out, maybe we can expand the idea of this file into >> stable/12 and even stable/11=2E One additional idea that came to mind >is >> with the formatting for stable branches=2E >>=20 >> For example, in head, there is: >>=20 >> rNNNNNN: >> The foo(8) utility was added=2E >>=20 >> For stable branches, I would propose the format of: >>=20 >> rNNNNNM, MFC of rNNNNNN: >> The foo(8) utility was added=2E >>=20 >> Thoughts? > >My thoughs originally on this was that when a release noteable item >is merged from head to stable the exact related commit to RELNOTES >should also be merged unaltered=2E > >The RELNOTES file should state that revision numbers in this file >are ^/HEAD revision numbers, and that a merge serach may be needed >to find the branch verson of the MFC=2E > >The ^/head RELNOTES file should be trunkated to length 0 when a =2E0 >branch is crated POST branch creation, thus all the relevant >entries are in the file on the new branch and can grow as things >are merged to it=2E Thus keeps the RELNOTES file in a state that >matches the branch as far as entires, just the Rxxxxx is referential >to when the entry was created relative to head=2E > >> Glen >--=20 >Rod Grimes =20 >rgrimes@freebsd=2Eorg --=20 Pardon the typos and autocorrect, small keyboard in use=2E=20 Cy Schubert <Cy=2ESchubert@cschubert=2Ecom> FreeBSD UNIX: <cy@FreeBSD=2Eorg> Web: https://www=2EFreeBSD=2Eorg The need of the many outweighs the greed of the few=2E Sent from my Android device with K-9 Mail=2E Please excuse my brevity=2E From owner-svn-src-head@freebsd.org Fri Nov 8 20:48:00 2019 Return-Path: <owner-svn-src-head@freebsd.org> Delivered-To: svn-src-head@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 8564515F7C0; Fri, 8 Nov 2019 20:48:00 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 478smJ2jKMz3Q8k; Fri, 8 Nov 2019 20:48:00 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C33C3E86; Fri, 8 Nov 2019 20:48:00 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA8Km0dg057176; Fri, 8 Nov 2019 20:48:00 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA8Km0V3057174; Fri, 8 Nov 2019 20:48:00 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201911082048.xA8Km0V3057174@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Fri, 8 Nov 2019 20:48:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354562 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 354562 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>; List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 08 Nov 2019 20:48:00 -0000 Author: markj Date: Fri Nov 8 20:47:59 2019 New Revision: 354562 URL: https://svnweb.freebsd.org/changeset/base/354562 Log: Add new iwm(4) files to sys/conf/files. Submitted by: rea MFC with: r354504 Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Fri Nov 8 20:14:36 2019 (r354561) +++ head/sys/conf/files Fri Nov 8 20:47:59 2019 (r354562) @@ -1918,6 +1918,8 @@ iwi_monitor.fw optional iwimonitorfw | iwifw \ dev/iwm/if_iwm.c optional iwm dev/iwm/if_iwm_7000.c optional iwm dev/iwm/if_iwm_8000.c optional iwm +dev/iwm/if_iwm_9000.c optional iwm +dev/iwm/if_iwm_9260.c optional iwm dev/iwm/if_iwm_binding.c optional iwm dev/iwm/if_iwm_fw.c optional iwm dev/iwm/if_iwm_led.c optional iwm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E5CA313F-6D73-4058-AD6C-2FB940A398A4>