From: Christian Ehrig <cehrig@cloudflare.com>
To: broonie@kernel.org
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>, bpf <bpf@vger.kernel.org>,
Networking <netdev@vger.kernel.org>, Gavin Li <gavinl@nvidia.com>,
Jakub Kicinski <kuba@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the net-next tree
Date: Thu, 13 Apr 2023 18:31:47 +0200 [thread overview]
Message-ID: <20230413163147.GA25768@cloudflare.com> (raw)
In-Reply-To: <20230413161235.4093777-1-broonie@kernel.org>
On Thu, Apr 13, 2023 at 05:12:35PM +0100, broonie@kernel.org wrote:
> 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.
>
> diff --cc include/net/ip_tunnels.h
> index 255b32a90850a,7912f53caae0b..0000000000000
> --- a/include/net/ip_tunnels.h
> +++ 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
This looks good to me. Thanks much.
next prev parent reply other threads:[~2023-04-13 16:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 16:12 linux-next: manual merge of the bpf-next tree with the net-next tree broonie
2023-04-13 16:31 ` Christian Ehrig [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-17 23:29 Stephen Rothwell
2023-12-14 23:56 Stephen Rothwell
2023-11-30 22:47 Stephen Rothwell
2023-03-19 23:09 Stephen Rothwell
2023-03-20 3:17 ` Bagas Sanjaya
2023-02-19 23:00 Stephen Rothwell
2023-02-20 11:53 ` Alexander Lobakin
2023-02-06 23:19 Stephen Rothwell
2022-05-11 1:10 Stephen Rothwell
2021-01-25 0:12 Stephen Rothwell
2021-01-25 16:09 ` Stanislav Fomichev
2021-01-25 18:03 ` Arjun Roy
2021-02-14 21:12 ` Stephen Rothwell
2021-02-14 21:40 ` Arjun Roy
2021-02-14 23:00 ` Stephen Rothwell
2020-08-03 3:05 Stephen Rothwell
2020-07-21 2:16 Stephen Rothwell
2020-07-21 8:53 ` Lorenzo Bianconi
2020-07-21 2:12 Stephen Rothwell
2019-11-24 23:58 Stephen Rothwell
2019-11-25 1:19 ` Alexei Starovoitov
2019-07-01 4:47 Stephen Rothwell
2018-11-21 23:36 Stephen Rothwell
2018-04-26 0:49 Stephen Rothwell
2018-04-26 7:56 ` Daniel Borkmann
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=20230413163147.GA25768@cloudflare.com \
--to=cehrig@cloudflare.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=broonie@kernel.org \
--cc=daniel@iogearbox.net \
--cc=gavinl@nvidia.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@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).