Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3316731pxf; Mon, 15 Mar 2021 07:02:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1/If7vzVAuFq6W6MHH9WRx2WB27xKp9JdM0HmOQqLLkOwSedIYJ4K+wtLM0G8u7fA87Al X-Received: by 2002:a17:907:d8a:: with SMTP id go10mr24085473ejc.46.1615816938025; Mon, 15 Mar 2021 07:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615816938; cv=none; d=google.com; s=arc-20160816; b=rQMPpej0Th8Hb996W1zxvAJZm8V9hL4hjrCIKesonWssU8KZE+Wj1cDi2rBnfcnTPY E7Sr2W1lNqEyiYrXm4q6t2m8psKHAzCFyuq9A+l8dFJMRkuSYLXilJgV4A/Jniq23YKL Oy1mdCY5sVpAdMsWGd7sr8FuvGM3qt5jqPBKnEGycSn/+dgEqAQU8Suh21iH88Cdpd/z x65++hoJ6eXu9/Ro0V2f8b2TT0FYKBz778Glqo+sQnfLfvUGgwiv4sZWpZRyu60+6nNP OutDy8j/WYEKBUw75l+WmOIw1nJu4q2BNeqLwNQogREkOV6WvTvL9VpJYzwfnicf3Atf atGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OSHMcWSczbAuPGJazASbtdcHp0VUI5R/E8+31w2GqIE=; b=jNZgruFN5QQfwhtnVP6GFZ/cg26178nqbMeH7QRaEB8/6fu2b46tDxXyBCQf91UITQ RnGVwDK0B5NFQeLxNEogPxWeTxXGaeXOulkVHcq/CmlWYJBsscpsQndClQY2dVtrqbEM PG0/C01QqE9ZikPsRqwN4LdfhHH9UX5OoiGlL6EZdLcJkDSXL4GOs9I7q2kYSzw6A6eY 9TYlcjgszAh8rLhN/hNhh1ZioBccqVQn9XzBN+8EgzYEwpsANfK31qiA7r07IGsMOqYC lHvLFx0Y8XhE0VRsxEN1/coaUvXODynYZb+vPAG8Gfpy2BbIjMKBYakFty++MBwOIWDZ Gc+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hSoin9Yb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v4si11356876ejx.329.2021.03.15.07.01.51; Mon, 15 Mar 2021 07:02:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hSoin9Yb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233146AbhCOOAv (ORCPT + 99 others); Mon, 15 Mar 2021 10:00:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:33014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231908AbhCON4S (ORCPT ); Mon, 15 Mar 2021 09:56:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BD4A464EEC; Mon, 15 Mar 2021 13:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816577; bh=sdWnjAJvlnqJ2n9U+Zkd63cqwHEfAh4fXY7VV+tHcpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hSoin9YbIbRyHLkldqDIB5zXtakTgJ4Pr8Z4ly5o5nvmR7t+j57p9IU49X71kBbDQ Y2EZdkCI/0FscZBZbtL0fzlWOxThg4LRtpiAgY0B7jsAHLb0Q/Nb/nq34z8BQslZjV TpMBL0tJnKC85GmXWLklXehlBlrI0b02YTL0EaXY= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Dmitry V. Levin" , Pablo Neira Ayuso Subject: [PATCH 5.11 001/306] uapi: nfnetlink_cthelper.h: fix userspace compilation error Date: Mon, 15 Mar 2021 14:51:04 +0100 Message-Id: <20210315135507.664859664@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135507.611436477@linuxfoundation.org> References: <20210315135507.611436477@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Dmitry V. Levin commit c33cb0020ee6dd96cc9976d6085a7d8422f6dbed upstream. Apparently, and could not be included into the same compilation unit because of a cut-and-paste typo in the former header. Fixes: 12f7a505331e6 ("netfilter: add user-space connection tracking helper infrastructure") Cc: # v3.6 Signed-off-by: Dmitry V. Levin Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- include/uapi/linux/netfilter/nfnetlink_cthelper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/uapi/linux/netfilter/nfnetlink_cthelper.h +++ b/include/uapi/linux/netfilter/nfnetlink_cthelper.h @@ -5,7 +5,7 @@ #define NFCT_HELPER_STATUS_DISABLED 0 #define NFCT_HELPER_STATUS_ENABLED 1 -enum nfnl_acct_msg_types { +enum nfnl_cthelper_msg_types { NFNL_MSG_CTHELPER_NEW, NFNL_MSG_CTHELPER_GET, NFNL_MSG_CTHELPER_DEL,