Messages in this thread | | | Subject | Re: linux-next: manual merge of the net-next tree with the bpf tree | From | Yonghong Song <> | Date | Tue, 31 Jul 2018 21:23:46 -0700 |
| |
On 7/31/18 6:35 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > tools/bpf/bpftool/map.c > > between commit: > > 573b3aa69406 ("tools/bpftool: fix a percpu_array map dump problem") > > from the bpf tree and commit: > > 2d3feca8c44f ("bpf: btf: print map dump and lookup with btf info") > > from the net-next tree.
The merge looks good to me. Thanks!
> > 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. >
| |