Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754914AbcLSJGk (ORCPT <rfc822;w@1wt.eu>);
        Mon, 19 Dec 2016 04:06:40 -0500
Received: from mail-oi0-f54.google.com ([209.85.218.54]:35442 "EHLO
        mail-oi0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753287AbcLSJGi (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 19 Dec 2016 04:06:38 -0500
MIME-Version: 1.0
X-Originating-IP: [217.173.44.24]
In-Reply-To: <20161219102555.15519eee@canb.auug.org.au>
References: <20161219102555.15519eee@canb.auug.org.au>
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Mon, 19 Dec 2016 10:06:36 +0100
Message-ID: <CAJfpeguwvwy78-ahrswi5_RRENUzuSbqF2PR2x+nKxX1WC6h9Q@mail.gmail.com>
Subject: Re: linux-next: manual merge of the overlayfs tree with Linus' tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 449
Lines: 18

On Mon, Dec 19, 2016 at 12:25 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Miklos,
>
> Today's linux-next merge of the overlayfs tree got conflicts in:
>
>   fs/overlayfs/dir.c
>   fs/overlayfs/inode.c
>
> I am pretty sure thses conflicts only exist because the overlayfs tree
> was rebased before being merged by Linus.  I am dropping the oevrlay fs
> tree for today.  Please clean it up.

Hi Stephen,

Sorry, fixed now.

Thanks,
Miklos