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 S1752581AbdBCJDy (ORCPT <rfc822;w@1wt.eu>);
        Fri, 3 Feb 2017 04:03:54 -0500
Received: from ozlabs.org ([103.22.144.67]:46049 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752471AbdBCJDt (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 3 Feb 2017 04:03:49 -0500
Date: Fri, 3 Feb 2017 20:03:46 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Amir Goldstein <amir73il@gmail.com>
Subject: Re: linux-next: manual merge of the vfs-miklos tree with the
 overlayfs tree and build failure
Message-ID: <20170203200346.7f80d372@canb.auug.org.au>
In-Reply-To: <CAJfpegtAZkenPkE0NHUfeSFcCJmBygVqCh8_yaVRqLj-5hjKEQ@mail.gmail.com>
References: <20170131111656.3e77663b@canb.auug.org.au>
        <20170203093436.0c486463@canb.auug.org.au>
        <CAJfpegtAZkenPkE0NHUfeSFcCJmBygVqCh8_yaVRqLj-5hjKEQ@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 Miklos,

On Fri, 3 Feb 2017 09:35:09 +0100 Miklos Szeredi <miklos@szeredi.hu> wrote:
>
> Sorry, I removed the conflicting content from that tree.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell