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