Re: linux-next: manual merge of the net-next tree with the net tree

From	Daniel Borkmann <daniel@iogearbox.net>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the net-next tree with the net tree
Date	2015-11-26 01:20 +0100
Message-ID	<qySs2-51l-29@gated-at.bofh.it> (permalink)
References	<qySim-4XI-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the net tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-26 01:10 +0100
  Re: linux-next: manual merge of the net-next tree with the net tree Daniel Borkmann <daniel@iogearbox.net> - 2015-11-26 01:20 +0100

csiph-web