From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751181AbdLNH11 (ORCPT ); Thu, 14 Dec 2017 02:27:27 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:40627 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751072AbdLNH1Z (ORCPT ); Thu, 14 Dec 2017 02:27:25 -0500 X-ME-Sender: Date: Thu, 14 Dec 2017 08:27:30 +0100 From: Greg KH To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , John Stultz Subject: Re: linux-next: build failure after merge of the staging.current tree Message-ID: <20171214072730.GD27027@kroah.com> References: <20171214170033.24a606b6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171214170033.24a606b6@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 Thu, Dec 14, 2017 at 05:00:33PM +1100, Stephen Rothwell wrote: > Hi Greg, > > After merging the staging.current tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > drivers/staging/android/ion/ion_cma_heap.c: In function 'ion_cma_allocate': > drivers/staging/android/ion/ion_cma_heap.c:38:14: error: 'CONFIG_CMA_ALIGNMENT' undeclared (first use in this function) > if (align > CONFIG_CMA_ALIGNMENT) > ^ > > Caused by commit > > d98e6dbf42f7 ("staging: ion: Fix ion_cma_heap allocations") > > CONFIG_CMA_ALIGNMENT (and CONFIG_DMA_CMA) is not set for this build. > > I have reverted that commit for today. Thanks, and sorry about that. John is working on a fix... greg k-h