From patchwork Thu Apr 13 16:12:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 83031 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1155167vqo; Thu, 13 Apr 2023 09:17:32 -0700 (PDT) X-Google-Smtp-Source: AKy350aDJbLFnIGSYNV91Z3/vZY95vDobrlsg2gbSZWGJVKiftGTUR19VHuHnvADQBb3PQUEn5fh X-Received: by 2002:a17:902:a5cc:b0:19f:3b86:4715 with SMTP id t12-20020a170902a5cc00b0019f3b864715mr2638788plq.8.1681402652159; Thu, 13 Apr 2023 09:17:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681402652; cv=none; d=google.com; s=arc-20160816; b=iqQBPn/BnuilU9G9/8HecCnRRCdQ3GB/FTqXxfLjCqxKRH9HQBQe4ZM39R+i9BLJtB 1uXy03q3Bhzc1e6Qr/iOdf2+IEp1G4Xxs2h64OCj1PQ3l3bId8u4cHSRNsN8O9g8t4/Z k5onto4Dav8i3RMf8gjDJQ4SNmDWfdsW2TaVd3m5Dla96GsbzcaC+sdB7UsAbw+0NSeE mUkr+TsznLS+JDrT7ddhQC+k/q5ehJIj9jfzwOPAYCyDFkTbFBRkyJ4AYjzGMa5rzd9e FgNzyQ8YHRu06tf2sJwVtXUS47sHxykUVl7k1KV2uQQzW9uMBv65Or9t2ygS2uBOBC9w CHZA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=s/Qv87mvnaUmvNOgqYPOE0YNPfTN75Gnrm+OQLsKK3w=; b=TvpV4XLJuCJ4SXHEWGXwKImzxgsvXPoolopwzjb8dTjYy1ejhDvT3hnGPq82BBhtNE X7J2wsREjL703Ft8jyPaiF7RiuoRWt7E7P07hqfo2rKBVIf3Cu+YMzj+sUk42BkfOyQ+ +DDRe135VqlF3sMhgxN+59mqI4gaGRcn1H2y9+DOqljW/xs3GNCvLKYG3xYJGIkfGCRv VGJX2VJ4TGou4F5diztYc2AevhAy/nImtNz4GqhP7pSXptHvVHAUT9/UptTbWJ+SW2eK YrSK2m8Pw9OohpFV2W6fWY9eE0Yg2u/q1TVHiZ6E6WXLvYMMMNqpQgus4GSK0LFFpmZa 7J3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ThGUbHOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p15-20020a170902e74f00b001a6527f6adbsi2651466plf.137.2023.04.13.09.17.19; Thu, 13 Apr 2023 09:17:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ThGUbHOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230148AbjDMQNT (ORCPT + 99 others); Thu, 13 Apr 2023 12:13:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230088AbjDMQNQ (ORCPT ); Thu, 13 Apr 2023 12:13:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45A77CF; Thu, 13 Apr 2023 09:13:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BFD5863E84; Thu, 13 Apr 2023 16:13:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01E4FC433D2; Thu, 13 Apr 2023 16:13:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681402391; bh=WFL8bYhH3x0BIzgVY6RGVd6JNmx2NXv89vVV8SM0+cc=; h=From:To:Cc:Subject:Date:From; b=ThGUbHOH8fqQ+2zNkNTFew5Daiu/16iKwtGhCiJa3mdSq9GK1jjfl3i26AEGxN1xl stauklDJV00CGpkYFObty05OakcsWF7SeYW2d2C+zslEYIw8HlIP2cf8LaAs6hO+rx LHyAK76qlfW640Tqg1JgQMhIeYu8J2Py8/AaCxz6k01NN0tQj7U2lmpCJyC0wOfLuD 7reyfktCTyVCS3uIAmJGhPV+cyKqywoldTdf8YDPPMCbjM8/aXlckX8GeH9AGj1CeN +BrRwsDu9pnCDjuvk33IaQnhuSsXwYHnxEzn8aOxuyf5FzLPlo2WneMvM0ZDrDMymT FbcU4tgE6RN/w== From: broonie@kernel.org To: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , bpf , Networking Cc: Christian Ehrig , Gavin Li , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the bpf-next tree with the net-next tree Date: Thu, 13 Apr 2023 17:12:35 +0100 Message-Id: <20230413161235.4093777-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763078466980784693?= X-GMAIL-MSGID: =?utf-8?q?1763078466980784693?= Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: include/net/ip_tunnels.h between commit: bc9d003dc48c3 ("ip_tunnel: Preserve pointer const in ip_tunnel_info_opts") from the net-next tree and commit: ac931d4cdec3d ("ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices") from the bpf-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. +++ b/include/net/ip_tunnels.h @@@ -66,15 -73,9 +73,16 @@@ struct ip_tunnel_encap #define IP_TUNNEL_OPTS_MAX \ GENMASK((sizeof_field(struct ip_tunnel_info, \ options_len) * BITS_PER_BYTE) - 1, 0) + +#define ip_tunnel_info_opts(info) \ + _Generic(info, \ + const struct ip_tunnel_info * : ((const void *)((info) + 1)),\ + struct ip_tunnel_info * : ((void *)((info) + 1))\ + ) + struct ip_tunnel_info { struct ip_tunnel_key key; + struct ip_tunnel_encap encap; #ifdef CONFIG_DST_CACHE struct dst_cache dst_cache; #endif diff --cc include/net/ip_tunnels.h index 255b32a90850a,7912f53caae0b..0000000000000 --- a/include/net/ip_tunnels.h