From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751983Ab1FHQcy (ORCPT ); Wed, 8 Jun 2011 12:32:54 -0400 Received: from out2.smtp.messagingengine.com ([66.111.4.26]:54263 "EHLO out2.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750885Ab1FHQcw (ORCPT ); Wed, 8 Jun 2011 12:32:52 -0400 X-Sasl-enc: wDxnHt55vEY0vmIq6URQRc7B+4AkUIDVy1tGWZhuKY3g 1307550771 Date: Wed, 8 Jun 2011 09:21:05 -0700 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , "Igor M. Liplianin" Subject: Re: linux-next: build failure after merge of the staging.current tree Message-ID: <20110608162105.GE21645@kroah.com> References: <20110608114130.444a7f99.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110608114130.444a7f99.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 08, 2011 at 11:41:30AM +1000, Stephen Rothwell wrote: > Hi Greg, > > After merging the staging.current tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/media/video/cx23885/cx23885-cards.c:28:28: fatal error: staging/altera.h: No such file or directory > > Caused by commit 85ab9ee946da ("Staging: altera: move .h file to proper > place"). Now resolved, it should be fine for you to pull from for the next linux-next release. greg k-h