From nobody Sat Jun 18 07:07:46 2022 X-Original-To: dev-commits-src-all@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 874E085B2DB; Sat, 18 Jun 2022 07:07:46 +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 4LQ6S23MV2z3hTm; Sat, 18 Jun 2022 07:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655536066; 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=YpNP2f/Osor4fuPNcfj2ZlvCqn8Jb6ksuloXPrhaMYo=; b=nzGKnqJaQ/0NDbbsBGOwx/8ZV7420NZ5tiXO0nTIkpGrqbHWgLLmINDNfzYnqh8ProZkP0 maSQQUElmTeZMRxJDVL56Vr7togkydlFuSZbfI9OSW39b2U6PrDgv1AwEnlONeQAuxZEY2 JKGVzoD4iXM6EusHO4X2cEsksWHpu7GlEnwm78CwgB8mfe3v5mTfrMRyx3qmXjE3VdzKa3 QXWTpJOq0ip25iRy9IMW4J5sl5DJMegEcA9O6pKtzogRGlcSQRkDTM+raYNW6P2QyqrYOp 4XBfwPZSeLtoo+jwhirh0EE7iMr+9GU7GBrMfZxhdcqnsi2Lewh6HI0ul8wY2A== 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 5365A7EA6; Sat, 18 Jun 2022 07:07:46 +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 25I77kNf053888; Sat, 18 Jun 2022 07:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25I77kC2053887; Sat, 18 Jun 2022 07:07:46 GMT (envelope-from git) Date: Sat, 18 Jun 2022 07:07:46 GMT Message-Id: <202206180707.25I77kC2053887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: b8ab9651b1e4 - stable/13 - Fix e013e369 mismerge which is causes i386 LINT fails to build. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b8ab9651b1e407a372c81e2fb122a33484139949 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655536066; 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=YpNP2f/Osor4fuPNcfj2ZlvCqn8Jb6ksuloXPrhaMYo=; b=jqItpqh2uUpM6jjQ29B5KVz+llY3xM6zE2blN8ke1VIIXZ0f/SeM0H6NCUz6LtgE/wX09Q nl0p8BnJCK9J+bBPkEkrFJUSJuwzSA7IUSOVjOOiQxwbJqrMys4kxBrnSdoaydJVYZcJSv G6ge8pvZCBaFzfbZ9bI7Q1cJwb8lI1386ivMvUFRx3uX4X66fSn6Z0ZcIgSzqILrTX89BC 4A6t7ZM0sR6o9sklWXYWdweFRUBCl+Y0hvoVou1WxlPS3t8m/HZTxS9FuY3mA5zi8UGiiw 728WAvoomulNO9qWPrLF4Qk2zjgdTTKLj+XDGPgKM+/9bWeL2BfkDJ3WXVlpkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655536066; a=rsa-sha256; cv=none; b=g1nKyM1ZRi2mtJVg8LiAsRLlVSsskLFVhezY/WuO+AkBIlmSl8gF1dafqaMXodPhNJo+fU xtBAy0MI03Wig2TJqsZ2TS0w86f+7NRuz4rjqTA4BmbZHpPFE0yKXAxg1xBmBBcBBTgxbw BWj+JghNaeypsWTM+h83Kz0yvAzmTnOx9N0rURKYK1C8M5qkEnsvXnA/Q8oTkXEBr5mGC0 W3XI1eYcdZADIEzis6/yZJK/k5Ss1juQiCRIokKOAPmGkOTewjZhBLKNnPjjk+8GWdaIly V9xdYaM7QrRwcu9OmY9GdH+x54fXjOszBvcsfOdIumX6AR0DmMiFektgtrvoRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b8ab9651b1e407a372c81e2fb122a33484139949 commit b8ab9651b1e407a372c81e2fb122a33484139949 Author: Dmitry Chagin AuthorDate: 2022-06-18 07:06:58 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-18 07:06:58 +0000 Fix e013e369 mismerge which is causes i386 LINT fails to build. This is a direct commit to the stable/13. --- sys/i386/conf/NOTES | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index fb0d52ad8582..3144adf12c90 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -882,7 +882,6 @@ options NDISAPI device ndis -======= ##################################################################### # VM OPTIONS