Messages in this thread | | | Date | Thu, 26 Nov 2015 01:16:14 +0100 | From | Daniel Borkmann <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
On 11/26/2015 01:01 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > kernel/bpf/syscall.c > > between commit: > > c9da161c6517 ("bpf: fix clearing on persistent program array maps") > > from the net tree and commit: > > f99bf205dab0 ("bpf: add show_fdinfo handler for maps") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Seems fine, thanks!
| |