From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: linux-next: manual merge of the staging tree with the staging.current tree Date: Wed, 01 Dec 2010 19:20:46 -0800 Message-ID: <4CF7108E.6020701@oracle.com> References: <20101202132254.93e019c7.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from rcsinet10.oracle.com ([148.87.113.121]:20536 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755739Ab0LBDVq (ORCPT ); Wed, 1 Dec 2010 22:21:46 -0500 In-Reply-To: <20101202132254.93e019c7.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Greg KH , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Pekka Enberg On 12/01/10 18:22, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/winbond/sysdef.h between commit > 412dc7f368bf10a8049a8a4c41abbfd0108742e7 ("staging: fix winbond build, > needs delay.h") from the staging.current tree and commit > ddee7e28e7d5e4ba2b8537c6a59b035745c250bb ("Staging: w35und: Remove empty > sysdef.h header") from the staging tree. > > I removed the file. I wonder if > drivers/staging/winbond/phy_calibration.c and > drivers/staging/winbond/reg.c now need their own includes of > linux/delay.h ... Probably, since sysdef.h was no longer an empty file. -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***