From nobody Mon Dec 13 23:49:19 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 46AC118E474F; Mon, 13 Dec 2021 23:49:20 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JCdX008tVz4c46; Mon, 13 Dec 2021 23:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D95171DC3E; Mon, 13 Dec 2021 23:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BDNnJ2j032252; Mon, 13 Dec 2021 23:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDNnJqr032251; Mon, 13 Dec 2021 23:49:19 GMT (envelope-from git) Date: Mon, 13 Dec 2021 23:49:19 GMT Message-Id: <202112132349.1BDNnJqr032251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 5297382c63f3 - stable/12 - Revert "riscv: add COMPAT_FREEBSD12 option" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5297382c63f3ba9a5bd9236732b1ca1b9e7c76db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639439360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5PohzhddaGLdFbD8UIu6wULoNTEMJA6+mHeIA5D50tY=; b=pmWMsnOgACz0dZ7foBCVrI8oq9Ek8L09Cl4ENwP458euFhiZeVYIfYbjjHBRAc12TNEAs1 wot7mm04dO/JU7rSJtsfyQsh4iUVuOhhIAt6pRrVnh/G5AItI/ius2TLvakJ+kZange41m VufyOAIf9s4IyeyaonHyITbL4U/bv2NxdmS4Kc6QpAXVTwhhMcPt6Xzy3IxaTdMR+5Oqrr LM/D6ofBRO2Gdh6QQQ82nLbrflrg77/Ln7MFXjsBnalmcSpPU1ooH30Qbjc12mFP+teY71 iuka+WE21LeNS+D+hfJS0SCGegjEEyo5KgPK9Gnzg2ntRZk5jW3BFYQGUmzFFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639439360; a=rsa-sha256; cv=none; b=kH4N31iKdXExmiwl5IQkNDYHdhRHgWEgGzfxLW++/4iZh/PiTyBJ3BD1e9HVHQLahtALtB G7Oq7dgtnPGYA5rnDr8UdGDqurx+yjSHo9/3k+FXCUvdngiivt8kTTs+b+X+pMd3uDIrMY J+6Q0J7hwmwV9LLIxErXxB6/hZxzrLM6LerIhuk0MpId03gAtwWq+JoK4jJ3NxjUfJ55Eh J896GFu4VGzjtig1li6vfun0xgvj+p4VClzZ/vO6HYr2uZfzVOJnfPXD19m43quhfP04my 3Iemzn9kcLD98CaoFVUKTtOjCJc6Lr6V2abzaSh7WzrO6u2uNXw1zCzIIs0c8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5297382c63f3ba9a5bd9236732b1ca1b9e7c76db commit 5297382c63f3ba9a5bd9236732b1ca1b9e7c76db Author: Jessica Clarke AuthorDate: 2021-12-13 23:45:45 +0000 Commit: Jessica Clarke CommitDate: 2021-12-13 23:45:45 +0000 Revert "riscv: add COMPAT_FREEBSD12 option" There is no COMPAT_FREEBSD12 in stable/12, only 13 and above. This reverts commit c31b7fd8b294e64b285898ffbfb613b178948126. Direct commit to stable/12 since the aforementioned commit was an MFC that should not have happened. --- sys/riscv/conf/GENERIC | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 5cba4cc2f94f..4982c48ece39 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -51,7 +51,6 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization -options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support