Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1760618AbcLRX0C (ORCPT <rfc822;w@1wt.eu>);
        Sun, 18 Dec 2016 18:26:02 -0500
Received: from ozlabs.org ([103.22.144.67]:34281 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751697AbcLRXZ7 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Sun, 18 Dec 2016 18:25:59 -0500
Date: Mon, 19 Dec 2016 10:25:55 +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
Subject: linux-next: manual merge of the overlayfs tree with Linus' tree
Message-ID: <20161219102555.15519eee@canb.auug.org.au>
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
Content-Length: 333
Lines: 14

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.

-- 
Cheers,
Stephen Rothwell