From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757909AbcAKBQb (ORCPT ); Sun, 10 Jan 2016 20:16:31 -0500 Received: from ozlabs.org ([103.22.144.67]:35738 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752434AbcAKBQa (ORCPT ); Sun, 10 Jan 2016 20:16:30 -0500 Date: Mon, 11 Jan 2016 12:16:28 +1100 From: Stephen Rothwell To: Al Viro , Trond Myklebust Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: linux-next: manual merge of the vfs tree with the nfs tree Message-ID: <20160111121628.1e2597fc@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; 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/nfs/nfs4file.c between commit: 926ea40a7ee2 ("NFSv4: Fix a compile warning about no prototype for nfs4_ioctl()") from the nfs tree and commit: 04b38d601239 ("vfs: pull btrfs clone API to vfs layer") from the vfs tree. I fixed it up (the latter removed the code fixed in the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au