From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30792C433E7 for ; Thu, 15 Oct 2020 20:06:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C44A42073A for ; Thu, 15 Oct 2020 20:06:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731150AbgJOUGY (ORCPT ); Thu, 15 Oct 2020 16:06:24 -0400 Received: from brightrain.aerifal.cx ([216.12.86.13]:34434 "EHLO brightrain.aerifal.cx" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731103AbgJOUGY (ORCPT ); Thu, 15 Oct 2020 16:06:24 -0400 Date: Thu, 15 Oct 2020 16:06:23 -0400 From: Rich Felker To: Petr Vorel Cc: linux-kernel@vger.kernel.org, musl@lists.openwall.com, Peter Korsgaard , Baruch Siach , Florian Weimer , linux-api@vger.kernel.org, libc-alpha@sourceware.org Subject: Re: [musl] [PATCH v3 1/1] uapi: Move constants from to Message-ID: <20201015200622.GY17637@brightrain.aerifal.cx> References: <20201015190013.8901-1-petr.vorel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201015190013.8901-1-petr.vorel@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Precedence: bulk List-ID: X-Mailing-List: linux-api@vger.kernel.org On Thu, Oct 15, 2020 at 09:00:13PM +0200, Petr Vorel wrote: > and include in UAPI headers instead of . > > The reason is to avoid indirect include when using > some network headers: or others -> > -> . > > This indirect include causes on MUSL redefinition of struct sysinfo when > included both and some of UAPI headers: > > In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, > from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, > from ../include/tst_netlink.h:14, > from tst_crypto.c:13: > x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of ‘struct sysinfo’ > struct sysinfo { > ^~~~~~~ > In file included from ../include/tst_safe_macros.h:15, > from ../include/tst_test.h:93, > from tst_crypto.c:11: > x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here > > Suggested-by: Rich Felker > Signed-off-by: Petr Vorel > --- > Changes v2->v3: > * Move things to instead of creating new header > . > > Kind regards, > Petr > > include/uapi/linux/const.h | 5 +++++ > include/uapi/linux/ethtool.h | 2 +- > include/uapi/linux/kernel.h | 9 +-------- > include/uapi/linux/lightnvm.h | 2 +- > include/uapi/linux/mroute6.h | 2 +- > include/uapi/linux/netfilter/x_tables.h | 2 +- > include/uapi/linux/netlink.h | 2 +- > include/uapi/linux/sysctl.h | 2 +- > 8 files changed, 12 insertions(+), 14 deletions(-) Acked-by: Rich Felker