From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752298AbdLGCqN (ORCPT <rfc822;w@1wt.eu>);
        Wed, 6 Dec 2017 21:46:13 -0500
Received: from ozlabs.org ([103.22.144.67]:39991 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751182AbdLGCqM (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 6 Dec 2017 21:46:12 -0500
Date: Thu, 7 Dec 2017 13:46:09 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jann Horn <jannh@google.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
        Pablo Neira Ayuso <pablo@netfilter.org>,
        NetFilter <netfilter-devel@vger.kernel.org>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the vfs tree with the netfilter
 tree
Message-ID: <20171207134609.6a3e5424@canb.auug.org.au>
In-Reply-To: <CAG48ez1itzyi=0_N-DfjJ+LYSTjCkQR-GHNLOSTnR=oOj7nyyQ@mail.gmail.com>
References: <20171207111035.7c22d7c0@canb.auug.org.au>
        <CAG48ez1itzyi=0_N-DfjJ+LYSTjCkQR-GHNLOSTnR=oOj7nyyQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Jann,

On Thu, 7 Dec 2017 01:48:14 +0100 Jann Horn <jannh@google.com> wrote:
>
> > I can't tell if the strlen test from the former is still needed, so I
> > just used the vfs tree version for now.  
> 
> Yeah, both of the checks from the netfilter tree are still necessary
> independent of the commit from the vfs tree.

Rats.  I will see what I can do about that.

> > I fixed it up (see below)  
> 
> Did you mean to paste in the fixed-up patch below this message?

Ah, well actually the diff ended up empty (since I used one side of the
conflicting part).
-- 
Cheers,
Stephen Rothwell