From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753825AbdLDJJy (ORCPT ); Mon, 4 Dec 2017 04:09:54 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:54499 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753794AbdLDJJv (ORCPT ); Mon, 4 Dec 2017 04:09:51 -0500 X-ME-Sender: Date: Mon, 4 Dec 2017 10:09:59 +0100 From: Greg KH To: Stephen Rothwell Cc: Al Viro , Linux-Next Mailing List , Linux Kernel Mailing List , Christian Gromm Subject: Re: linux-next: manual merge of the staging tree with the vfs tree Message-ID: <20171204090959.GB16936@kroah.com> References: <20171204125811.787cba01@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171204125811.787cba01@canb.auug.org.au> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 04, 2017 at 12:58:11PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/most/cdev/cdev.c > > between commit: > > afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances") > > from the vfs tree and commit: > > 1fd923f38610 ("staging: most: cdev: replace function prefix") > > 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. Fix looks correct to me, thanks. greg k-h