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=-6.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 15122C4708F for ; Wed, 2 Jun 2021 18:51:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E8A8B613B8 for ; Wed, 2 Jun 2021 18:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229590AbhFBSxf (ORCPT ); Wed, 2 Jun 2021 14:53:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59796 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbhFBSxe (ORCPT ); Wed, 2 Jun 2021 14:53:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622659910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LDW4VKY3FpjoAR8jIQ6HiHISKQVZaj+Z7o4ggTxUMMg=; b=Aps+QpoEoXaa/0GF6HjMjay11MPRPkAQwsBOW/weyci9ztdfq5kHANmhuF+TB1a84eecVV yQDQngVYS41kToW4/C3iY1i5xA7AUGLYqROg9dhFCZbSkjx+IWELdigXEMkdTVQsNS0+oD uH3SPBhZDS7Dt49GfzkKIbHvMJX9hTg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-368-SHDYIP_UO8aD7WiY2DmOdA-1; Wed, 02 Jun 2021 14:51:48 -0400 X-MC-Unique: SHDYIP_UO8aD7WiY2DmOdA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8422F107ACE3; Wed, 2 Jun 2021 18:51:47 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-228.ams2.redhat.com [10.36.113.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D5EF35D6DC; Wed, 2 Jun 2021 18:51:45 +0000 (UTC) From: Florian Weimer To: Andreas Roeseler Cc: netdev@vger.kernel.org, davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, kuba@kernel.org Subject: Re: [PATCH net-next V6 1/6] icmp: add support for RFC 8335 PROBE References: <87im2wup0m.fsf@oldenburg.str.redhat.com> <48ff14c5fff0af909519619caa26d20fcda5159c.camel@gmail.com> Date: Wed, 02 Jun 2021 20:51:43 +0200 In-Reply-To: <48ff14c5fff0af909519619caa26d20fcda5159c.camel@gmail.com> (Andreas Roeseler's message of "Wed, 02 Jun 2021 13:46:32 -0500") Message-ID: <87r1hkt800.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org * Andreas Roeseler: > Are and the only conflicting files? > is only included to gain use of the in_addr struct, but > that can be easily substituted out of the code in favor of __be32. > Therefore we would no longer need to include and would > remove the conflict. I'm not 100% sure, but it looks this way. I can include and both and in the same translation unit. Thanks, Florian