From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934567AbcECST7 (ORCPT ); Tue, 3 May 2016 14:19:59 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:51637 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932756AbcECST5 (ORCPT ); Tue, 3 May 2016 14:19:57 -0400 X-Sasl-enc: t4U7lFRkDCAnjx92NXhbS+tqTjXukL4w0Su4QUh5jl9p 1462299595 Date: Tue, 3 May 2016 11:19:54 -0700 From: Greg KH To: Stephen Rothwell Cc: Al Viro , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , "John L. Hammond" Subject: Re: linux-next: manual merge of the staging tree with the vfs tree Message-ID: <20160503181954.GC7819@kroah.com> References: <20160503164422.78369452@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160503164422.78369452@canb.auug.org.au> User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 03, 2016 at 04:44:22PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/lustre/lustre/llite/rw26.c > > between commit: > > c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO") > > from the vfs tree and commit: > > 8c7b0e1a6747 ("staging/lustre/llite: rename ccc_object to vvp_object") > > from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Looks good, thanks. greg k-h