From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753805AbbJODvp (ORCPT ); Wed, 14 Oct 2015 23:51:45 -0400 Received: from ozlabs.org ([103.22.144.67]:48846 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751259AbbJODvo (ORCPT ); Wed, 14 Oct 2015 23:51:44 -0400 Date: Thu, 15 Oct 2015 14:51:42 +1100 From: Stephen Rothwell To: "Koul, Vinod" Cc: "arnd@arndb.de" , "hch@lst.de" , "linux-kernel@vger.kernel.org" , "andriy.shevchenko@linux.intel.com" , "linux-next@vger.kernel.org" Subject: Re: linux-next: build failure after merge of the slave-dma tree Message-ID: <20151015145142.54e537a4@canb.auug.org.au> In-Reply-To: <1444880141.2926.28.camel@intel.com> References: <20151015115108.57c04f61@canb.auug.org.au> <1444880141.2926.28.camel@intel.com> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Vinod, On Thu, 15 Oct 2015 03:35:42 +0000 "Koul, Vinod" wrote: > > So should I ask Linus to apply this fix once merge window opens or you will send > this, how do we go about fixing this one :) > > Or should I merge the above commit from asm-generic tree? Up to you. Though you should only merge fro mthe asm-generic tree if the maintainer guarantees it will not be rebased. You could just wait and tell Linus that this fixup is needed when the two trees are merged. It really need to go into the merge commit to avoid bisection problems. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au