From owner-svn-src-all@freebsd.org Sun Oct 7 15:54:15 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39FD310C546B; Sun, 7 Oct 2018 15:54:15 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D1EB7893A1; Sun, 7 Oct 2018 15:54:14 +0000 (UTC) (envelope-from tuexen@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 C726715FF6; Sun, 7 Oct 2018 15:54:14 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w97FsErh068949; Sun, 7 Oct 2018 15:54:14 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w97FsEiU068945; Sun, 7 Oct 2018 15:54:14 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201810071554.w97FsEiU068945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 7 Oct 2018 15:54:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339223 - in head/sys: amd64/conf arm64/conf i386/conf X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: in head/sys: amd64/conf arm64/conf i386/conf X-SVN-Commit-Revision: 339223 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 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: Sun, 07 Oct 2018 15:54:15 -0000 Author: tuexen Date: Sun Oct 7 15:54:13 2018 New Revision: 339223 URL: https://svnweb.freebsd.org/changeset/base/339223 Log: Address the warning regarding duplicate option 'GEOM_PART_GPT' when configuring kernels for i386, amd64, and arm64. The 'GEOM_PART_GPT' option was added to the DEFAULTS configuration in r337967. Approved by: re (kib@) Reviewed by: ler@ Differential Revision: https://reviews.freebsd.org/D17458 Sponsored by: Netflix, Inc. Modified: head/sys/amd64/conf/GENERIC head/sys/amd64/conf/GENERIC-MMCCAM head/sys/arm64/conf/GENERIC head/sys/i386/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Sun Oct 7 15:28:50 2018 (r339222) +++ head/sys/amd64/conf/GENERIC Sun Oct 7 15:54:13 2018 (r339223) @@ -52,7 +52,6 @@ options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization options EFIRT # EFI Runtime Services support Modified: head/sys/amd64/conf/GENERIC-MMCCAM ============================================================================== --- head/sys/amd64/conf/GENERIC-MMCCAM Sun Oct 7 15:28:50 2018 (r339222) +++ head/sys/amd64/conf/GENERIC-MMCCAM Sun Oct 7 15:54:13 2018 (r339223) @@ -7,7 +7,6 @@ include MINIMAL ident GENERIC-MMCCAM # Access GPT-formatted and labeled root volume -options GEOM_PART_GPT options GEOM_LABEL # UART -- for bhyve console Modified: head/sys/arm64/conf/GENERIC ============================================================================== --- head/sys/arm64/conf/GENERIC Sun Oct 7 15:28:50 2018 (r339222) +++ head/sys/arm64/conf/GENERIC Sun Oct 7 15:54:13 2018 (r339223) @@ -50,7 +50,6 @@ options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) 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_FREEBSD32 # Incomplete, but used by cloudabi32.ko. Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Sun Oct 7 15:28:50 2018 (r339222) +++ head/sys/i386/conf/GENERIC Sun Oct 7 15:54:13 2018 (r339223) @@ -51,7 +51,6 @@ options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) 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_FREEBSD4 # Compatible with FreeBSD4