From: Pablo Neira Ayuso <pablo@netfilter.org>
To: David Howells <dhowells@redhat.com>
Cc: linux-api@vger.kernel.org, linux-kbuild@vger.kernel.org,
coreteam@netfilter.org, netfilter-devel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [netfilter-core] [PATCH 07/11] UAPI: netfilter: Fix symbol collision issues [ver #2]
Date: Fri, 28 Sep 2018 15:07:04 +0200 [thread overview]
Message-ID: <20180928130704.kcmsnsecp6aqpk66@salvia> (raw)
In-Reply-To: <153622555128.14298.11612304975343930534.stgit@warthog.procyon.org.uk>
On Thu, Sep 06, 2018 at 10:19:11AM +0100, David Howells wrote:
> The netfilter UAPI headers have some symbol collision issues:
>
> (1) "enum nfnl_acct_msg_types" is defined twice, and each definition is
> completely different.
>
> Fix this by renaming the one in nfnetlink_cthelper.h to be "enum
> nfnl_cthelper_types" to be consistent with the other things in that
> file.
>
> (2) There's a disagreement between ipt_ECN.h and ipt_ecn.h over the
> definition of various IPT_ECN_* constants, leading to an error over
> IPT_ECN_IP_MASK being substituted when being defined as an enum value
> in ipt_ecn.h if ipt_ECN.h is #included first.
>
> Fix this by removing the conflicting constants from ipt_ECN.h and
> including ipt_ecn.h instead.
David, may I upstream this or you will pass it to Greg? I can just
take this, as you prefer.
Thanks.
next prev parent reply other threads:[~2018-09-28 13:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 9:18 [RFC] UAPI: Check headers by compiling all together as C++ David Howells
2018-09-06 9:18 ` [PATCH 02/11] UAPI: keys: Fix use of C++ keywords as structural members [ver #2] David Howells
2018-09-06 9:18 ` [PATCH 03/11] UAPI: virtio_net: " David Howells
2018-09-06 15:02 ` Michael S. Tsirkin
2018-09-06 9:18 ` [PATCH 04/11] UAPI: bcache: Fix use of embedded flexible array " David Howells
2018-09-06 9:18 ` [PATCH 05/11] UAPI: coda: Move kernel internals out of public view " David Howells
2018-09-06 9:19 ` [PATCH 06/11] coda: Move internal defs out of include/linux/ " David Howells
2018-09-06 9:19 ` [PATCH 07/11] UAPI: netfilter: Fix symbol collision issues " David Howells
2018-09-10 17:32 ` kbuild test robot
2018-09-28 13:07 ` Pablo Neira Ayuso [this message]
2018-10-09 15:35 ` [netfilter-core] " David Howells
2018-09-06 9:19 ` [PATCH 08/11] UAPI: nilfs2: Fix use of undefined byteswapping functions " David Howells
[not found] ` <153622549721.14298.8116794954073122489.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org>
2018-09-06 9:18 ` [PATCH 01/11] UAPI: drm: Fix use of C++ keywords as structural members " David Howells
2018-09-06 9:19 ` [PATCH 09/11] UAPI: ndctl: Fix g++-unsupported initialisation in headers " David Howells
[not found] ` <153622556444.14298.5971956747198405225.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org>
2018-09-25 20:22 ` Dan Williams
2018-09-06 9:19 ` [PATCH 10/11] UAPI: ndctl: Remove use of PAGE_SIZE " David Howells
[not found] ` <153622557095.14298.10281337300003012767.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org>
2018-09-25 20:17 ` Dan Williams
2018-10-09 15:36 ` David Howells
2018-09-06 9:19 ` [PATCH 11/11] UAPI: Check headers build for C++ " David Howells
2018-09-10 16:26 ` kbuild test robot
2018-09-10 17:02 ` kbuild test robot
2018-09-14 9:10 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180928130704.kcmsnsecp6aqpk66@salvia \
--to=pablo@netfilter.org \
--cc=coreteam@netfilter.org \
--cc=dhowells@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).