From nobody Sat Mar 04 09:42:14 2023 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 4PTKck4yHFz3vpXZ; Sat, 4 Mar 2023 09:42:14 +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 4PTKck4W9tz45Nh; Sat, 4 Mar 2023 09:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677922934; 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=SNA/UPVmXTtpxuiDmWmL+BWb7da65WGd16YOBSJ9icA=; b=KvddHG2M7Ji+M3BOSETdydY7qB+UeYJp23BvXhfOk/4rekxcHm6m3Ho9s73J6W9qIN+/BV n1SNG8zkr2ZORj6HMc+u+yekGIDvdqkfO3j2YeyTvhMkAloWmzIlrPPZi14ELDHle00AcV 0vEeBhTWETlXsqT2euj7MBxbsdBri71cQEIhUM727JflREkiooaHfJCp7ovdx3iG6hIekE JAPDc3tLKGE7AHXYNtWwb8slD+vzRUlp2IMNKUmkxMwyOduta/jomO4nIwDfGc/RdqZ4NU VfcA/0KrQSDBniN3nP+VEoB70NP62D1HJ0NkaaEt1b04Xv9ZDNcb/zV6Yy3gIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677922934; 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=SNA/UPVmXTtpxuiDmWmL+BWb7da65WGd16YOBSJ9icA=; b=VmAhi5WBKeTqf81/kRWXLd2M0Qg9ntfNnjaD7ATgpNBpK9Zbn75uakWAazTbpV+DdxJLbd clrtKSHvJewZy1YKC8rmXRN7qdF3zB0Eo6IKy4qMzJpfG952f+dI6j8ZnzuO0tJ3WUukri x9wDr1gh1lKSW7+NPm16obp84JU5RS2zAUkpTBiNw+SfU2wAaFTykyX64Ny2gbaA0YDmuk ejCr4qeHMMhEwcBXlRY4sQRdZsc7//XzNwlAo4PD1nuZMZJhBzwMgKHf0DAl8UY0mHBjfJ X5tXK5h9qDzFRmGRbW2qb/0Yu/0+nz0RV6c4GAr4AvZxXJUqgy2zJUFMD5wjzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677922934; a=rsa-sha256; cv=none; b=TwoMFKbVguUcg55a3aZ5aCcK78sRHR8P8MDlpcmzGplz9DQrAeq3NuoP8sNRNxMjv9D4j/ Vw2vHrLcyAiYVi26XQ/9TVfJK8dTDEOyf+e98VkLlXi0WryinnLOWq84xW8vRtwwt9mc5I I+JtIeN3RfxqeDsFYxwqn0ai9SqMqxLMn5Br83UQZDp7IPpmcH0zxR2WwBCKeyTZ+ftFOL rCN3YF+7D1B+5q8eYyoTzrlGGmI9Mj683j9afllXRJKROniaMW6QWQgnuXJCJmARel+7s3 FBk0XhH3kf8QERhFgNdq3OG9oYcwoTSkqE+eDDvAkrr7S+Yw9jN0rhUFIaPlKA== 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 4PTKck3bDdzZTQ; Sat, 4 Mar 2023 09:42:14 +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 3249gEbK026560; Sat, 4 Mar 2023 09:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249gEL1026559; Sat, 4 Mar 2023 09:42:14 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:42:14 GMT Message-Id: <202303040942.3249gEL1026559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 8243e174630f - main - linux(4): Fixup 5c32488de0 mis-merge 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8243e174630f09654ae8b93bce8b7d84448bdcf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8243e174630f09654ae8b93bce8b7d84448bdcf3 commit 8243e174630f09654ae8b93bce8b7d84448bdcf3 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:42:04 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:42:04 +0000 linux(4): Fixup 5c32488de0 mis-merge --- sys/compat/linux/linux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 252645cf2ae5..dcf5ac1e6892 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -436,6 +436,8 @@ linux_ifflags(struct ifnet *ifp) { unsigned short flags; + NET_EPOCH_ASSERT(); + flags = if_getflags(ifp) | if_getdrvflags(ifp); return (bsd_to_linux_ifflags(flags)); }