Path: csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
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: Mon, 15 Aug 2016 10:00:01 +0200
Message-ID: <s6kYp-2JS-1@gated-at.bofh.it>
References: <s6e6C-6RG-13@gated-at.bofh.it>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
X-Authenticated-Sender: daniel@iogearbox.net
Sender: robomod@news.nic.it
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Approved: robomod@news.nic.it
Lines: 20
Organization: linux.* mail to news gateway
X-Original-Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sargun Dhillon <sargun@sargun.me>
X-Original-Date: Mon, 15 Aug 2016 09:51:59 +0200
X-Original-Message-ID: <57B1749F.8040100@iogearbox.net>
X-Original-References: <20160815103503.2ff7aa58@canb.auug.org.au>
X-Original-Sender: linux-kernel-owner@vger.kernel.org
Xref: csiph.com linux.kernel:1462614

On 08/15/2016 02:35 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
>    kernel/bpf/verifier.c
>
> between commit:
>
>    747ea55e4f78 ("bpf: fix bpf_skb_in_cgroup helper naming")
>
> from the net tree and commit:
>
>    60d20f9195b2 ("bpf: Add bpf_current_task_under_cgroup helper")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Looks good to me, thanks!