Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3320787pxf; Mon, 15 Mar 2021 07:05:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFFBrJeiMoRvYW+KS2njP8qkO4+wbZmeRFW6EwwMdIi28eGfTKho4HiGdcwm9FXGLKXyvG X-Received: by 2002:a05:6402:b41:: with SMTP id bx1mr30489147edb.69.1615817150653; Mon, 15 Mar 2021 07:05:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615817150; cv=none; d=google.com; s=arc-20160816; b=M7sRpNVeu6a063eiG54dxGZmTlhh1UAqBbb6Q0wxuF6mhdZcJzKQg4Wp7yCK7iOoe3 ezKsNadoISFSKwTKtol71lSEOrWJuyVv3LDbnKvlE/b28wBHTjSoVftn15N1RDZMLjXK n7bDfrGinzy0bKjiDrwk4qzRiivFNiTgcEJzPYjYAWN3FKoBFvxKEBLQX7NFUFg4xc83 NRZ1AdNKeCkkbH27/7+Eq3n/uAk+DkyJeZTH1m/+zi/Y79v/r0liRHu3l5HS5LhfTt8G C0Q3VYztCtnZpxuH10ScYhTZDOUYI0DPfXlb9NPNZXddKgc0Nz/qtDuNMNW7x/gYUsTC TfyA== 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=ZDS/mv9d6CCdz1E8E9fcKR9J/cfnJWuFkQosc5EnoY5xppGImAVU83xC89inbgofKT atGxMRH5jEQJqK0O/WWyKSd23ZVGmNi/ixXO74SJsrYXb2ILW1bo6YhFWIfZtxO4DyJp oYjYpDLndovAw14BcT//r/MygkNvgZ8eQtUaJN3JLxd0beREr4dzGjc9gw+wkmV5XySN b82MJU7bBCKvuoH/FOmLdE6UDxwLg/Xd1jFLaw4L6H7vZBuQt9fntUdx4a7Jsp4KY0qE t5NfwHnFAlqVYHMYzpO4hEH5Mii7gw5q2PISjuB3JjZ3B3ErWDLsCOP83z+srBgSidUM 6zQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wwDUZcKu; 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 bd28si10395985edb.570.2021.03.15.07.05.27; Mon, 15 Mar 2021 07:05:50 -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=wwDUZcKu; 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 S233264AbhCOOBT (ORCPT + 99 others); Mon, 15 Mar 2021 10:01:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:33312 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231941AbhCON4a (ORCPT ); Mon, 15 Mar 2021 09:56:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8444F64F0B; Mon, 15 Mar 2021 13:56:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816590; bh=sdWnjAJvlnqJ2n9U+Zkd63cqwHEfAh4fXY7VV+tHcpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wwDUZcKuAJC4caEK4Xnbmf1302I/q6z0hPk9SF9QxIiaVGWUMFXqSqRPKRztu5Fmj cCUWkmquq0jy222qwfarcfaEH8CCXqMX6i+3AjyYVqaG0hUqdbQw77RmxallufTXte wjkJAVQ1gGBsOod3fLJL6rF2Q53+7LKQSO6ODjuk= 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.10 001/290] uapi: nfnetlink_cthelper.h: fix userspace compilation error Date: Mon, 15 Mar 2021 14:51:34 +0100 Message-Id: <20210315135541.971330271@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@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,