From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755178AbbLGBql (ORCPT ); Sun, 6 Dec 2015 20:46:41 -0500 Received: from ozlabs.org ([103.22.144.67]:60531 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754612AbbLGBqj (ORCPT ); Sun, 6 Dec 2015 20:46:39 -0500 Date: Mon, 7 Dec 2015 12:46:36 +1100 From: Stephen Rothwell To: Al Viro Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Miklos Szeredi Subject: linux-next: manual merge of the vfs tree with Linus' tree Message-ID: <20151207124636.6ba25cdd@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Al, Today's linux-next merge of the vfs tree got a conflict in: fs/overlayfs/inode.c between commit: 0f7ff2dabbc9 ("ovl: get rid of the dead code left from broken (and disabled) optimizations") from Linus' tree and commit: 58809fadd08b ("broken permission checks in overlayfs ->setattr()") from the vfs tree. I fixed it up (I used the name ovl_copy_up_truncate from Linus' tree instead of ovl_copy_up_last) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au