Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 29 Mar 2021 10:28:37 +0200
From:   Jiri Olsa <jolsa@redhat.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     David Miller <davem@davemloft.net>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Networking <netdev@vger.kernel.org>,
        Jiri Olsa <jolsa@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Yonghong Song <yhs@fb.com>
Subject: Re: linux-next: manual merge of the net-next tree with the bpf tree
Message-ID: <YGGPtUcstloL8sC2@krava>
References: <20210329122916.5921aad9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210329122916.5921aad9@canb.auug.org.au>
Precedence: bulk

On Mon, Mar 29, 2021 at 12:29:16PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   include/linux/bpf.h
> 
> between commit:
> 
>   861de02e5f3f ("bpf: Take module reference for trampoline in module")
> 
> from the bpf tree and commit:
> 
>   69c087ba6225 ("bpf: Add bpf_for_each_map_elem() helper")
> 
> from the net-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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc include/linux/bpf.h
> index fdac0534ce79,39dce9d3c3a5..000000000000
> --- a/include/linux/bpf.h
> +++ b/include/linux/bpf.h
> @@@ -40,7 -40,7 +40,8 @@@ struct bpf_local_storage
>   struct bpf_local_storage_map;
>   struct kobject;
>   struct mem_cgroup;
>  +struct module;
> + struct bpf_func_state;
>   
>   extern struct idr btf_idr;
>   extern spinlock_t btf_idr_lock;

ack, thanks
jirka