From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree Date: Mon, 9 Dec 2013 00:21:52 -0800 Message-ID: <20131209082152.GA26809@kroah.com> References: <20131209144712.57a50d7ed468ae8a4d57a0bf@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from out4-smtp.messagingengine.com ([66.111.4.28]:37327 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760594Ab3LIIfq (ORCPT ); Mon, 9 Dec 2013 03:35:46 -0500 Received: from compute5.internal (compute5.nyi.mail.srv.osa [10.202.2.45]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 1602220ADA for ; Mon, 9 Dec 2013 03:35:46 -0500 (EST) Content-Disposition: inline In-Reply-To: <20131209144712.57a50d7ed468ae8a4d57a0bf@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo On Mon, Dec 09, 2013 at 02:47:12PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > fs/sysfs/file.c between commit a8b14744429f ("sysfs: give different > locking key to regular and bin files") from the driver-core.current tree > and commit 414985ae23c0 ("sysfs, kernfs: move file core code to > fs/kernfs/file.c") (among others) from the driver-core tree. > > I just dropped the driver-core.current tree commit as I don't see what > needs to be done after the other changes in the driver-core tree. Tejun said he would provide a merge fixup as we knew this was going to be a problem :) thanks, greg k-h