From nobody Fri Sep 16 16:56:41 2022 X-Original-To: dev-commits-src-main@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 4MTgG2249hz4cWlr; Fri, 16 Sep 2022 16:56:42 +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 4MTgG21VPYz3sBY; Fri, 16 Sep 2022 16:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663347402; 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=Tq+ru2ka8IytG3v00DlAaDsefmqis7C/7N30chvRN9U=; b=FtO4ROOrhdUbdASkDmP2RDY3hVykXz93AevLSjxBpsGA4teonCfap4C6soBlXxsLuzsUO8 nElcnsOJiwUccUASo8h8EXVNq2FzKKkVOK/AuZWHO+pHIz9TnREza2GjWfg6h06IRgkj/M jkSgCyJYBgtQUEzL5WthIJ2umVGMf8zeO28k+BlpiHv3HcvVGyIs51QSLWxpEkvfSr0kq4 VYOk3I8tSDFNEZWYV+CCUl6G71T3N+3BuCOcdZRKXYULkmptbEc8aTfu+0UPzlQpNYGWV6 mV75Umj+zj1LINDBJPulnH8GOSv5F3OyYUqKhdnJRTm6/96O2SyrPuRze5gKQA== 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 4MTgG20WgmzQVc; Fri, 16 Sep 2022 16:56:42 +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 28GGugRP062491; Fri, 16 Sep 2022 16:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28GGufwj062490; Fri, 16 Sep 2022 16:56:41 GMT (envelope-from git) Date: Fri, 16 Sep 2022 16:56:41 GMT Message-Id: <202209161656.28GGufwj062490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: dd2b9c296776 - main - stand: fix mismerge List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd2b9c2967767b19bcbc33de0e487405c612f59f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663347402; 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=Tq+ru2ka8IytG3v00DlAaDsefmqis7C/7N30chvRN9U=; b=jJdoisV/DkpSQ1w2OsNQd+0TLe5QWq7Z7VVCWcl7wsAezrGkalODGTVigZNZXHLfrY4a1a rsUYV9IP/BedBBP8Jf1Rv60Uhdcn4X7db+wQ57DGZib1BlACVzWHgh5gj6xtNiRNdpqMK5 mUBKhx3gzZCKyESWXXRtp+MD3aCA1kMuo+A/GssUnCB/WpV6z+dDIBVti2og1aPhjeCIJV LKltJB3Eb2C9eS0Z1ZIEpwrv9vH0WOk6VaKqe7JV3I31pKNHHPauMuaHO8owRI2fqgwvYs GmufQigSR1U2KhyZwtojxhzVpgruSH/ICqaZhuUi/bdlHqInP7kbBE7qCXCuTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663347402; a=rsa-sha256; cv=none; b=qHHy2NHOs3stHc6dCG4ka312dKiPpgItnog3aDiMJjafL2SGeYxb2zF1jXY/oPH5iHN3m8 kgaNVtqRchzbCcycQXq5Pp+mFZHbXpu2DstLbCFploD/pxWyopbrknl319r15duDW0vcEV KykbkXRNdpA4PlXCeo6Bo+izzUCoYovemzqdQDDqFaCl1SC/9zVfiDkSZQ6ltJtYVveOkb oErbDpZr1Ce46ga+qWFjgrx1yu8wSy60RHjlKYwbdKDXTha7c6C2oYHlZhgKh7jZdhNNna P6PYf3/8hT0ttl3KARsPqsIIicXrNCDbCkd8RZp+L135Hqd0kZ1Sf5OUzmwpyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dd2b9c2967767b19bcbc33de0e487405c612f59f commit dd2b9c2967767b19bcbc33de0e487405c612f59f Author: Warner Losh AuthorDate: 2022-09-16 16:54:04 +0000 Commit: Warner Losh CommitDate: 2022-09-16 16:54:04 +0000 stand: fix mismerge Remove stray line from mismerge of 5d1531d9d4e7. This is no longer needed. Fixes: 5d1531d9d4e7 Sponsored by: Netflix --- stand/common/metadata.c | 1 - 1 file changed, 1 deletion(-) diff --git a/stand/common/metadata.c b/stand/common/metadata.c index fc8857ee089e..a69c6d824d44 100644 --- a/stand/common/metadata.c +++ b/stand/common/metadata.c @@ -106,7 +106,6 @@ md_load_dual(char *args, vm_offset_t *modulep, vm_offset_t *dtb, int kern64) }; #endif - align = kern64 ? 8 : 4; howto = md_getboothowto(args); /*