From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753621AbbJOOIj (ORCPT ); Thu, 15 Oct 2015 10:08:39 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:51608 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750807AbbJOOIB (ORCPT ); Thu, 15 Oct 2015 10:08:01 -0400 From: Arnd Bergmann To: Stephen Rothwell Cc: "Koul, Vinod" , "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 Date: Thu, 15 Oct 2015 16:07:51 +0200 Message-ID: <5852722.yfOrjUKMax@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151015145142.54e537a4@canb.auug.org.au> References: <20151015115108.57c04f61@canb.auug.org.au> <1444880141.2926.28.camel@intel.com> <20151015145142.54e537a4@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:OMuKul8IgaXoflfFoCFZ5R9GVKeZbKUqatgkcwjG2GI2NdL6xwa VhNcLUwZsBmO0PfIjUQdxsEWkL1ZGWsR7RK/OFr6720ICoXp5bEJRjpJy+CRC3wJun7z9S6 /2WdouYZ+uuUjG8fOZWQK7itKiFzPY6AsvF6DUIyTHBuhxuac+Ts0RjvAtY5W9rbD+gBry4 M+2KWX21/+dLd/lxzRNuQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:Fajgcbh+vtQ=:B4zYQRSZzN/xUmc1c1Y0x/ ObaLSNn4D0F/bIh6L3fCuLm2pHHHFfydRrlfUlmNzmGDZU1i+Sd5g4DR7P5YYks4uH7NwGLot c80JeW+cMCV7cVvWaRG9gKjDaf+PlWYPUKk2mMFXxO7OPciBTPWAGHIjznb3U6yAm0mDVu77Y +l9ePpqE6m4Uh4jGxz4325kzjlx9EXg5koYNPT8boLZ/pJIoBIvnn3nx9OVw2Qua3XGjWu3rU wyIGwZTdua1QWCb33hKnDn6Sw46AKjEJncYnACttWs6cz3Mx2nqFPBjO8FqYhb4GTdO0SfLEf VCUogxLdYOvb46if3ELBfa7XuxfKsmhvHo0L5F+iygvPfQ1VU5ncNG/WvBUD7Q1sjZO0+iadt Ds4Y/KOY/BiJiBokY80u27J2POogHiQ09j/r0hQGGngR6RxQMtGbWy8bA/eb8nvUqk8Ibba0A /pcev8TUjRbiANs7oGcHCXX5h0sJ7qAslzUHP8ZPEE+yEkJB2Nq1T9luSMWtBc/i3IznEabpY BpJf2z37besx210zVJXfir2AQNcTDU7e9KuLAVBR4am2CxJGpYAR4ZvCoa6Nf5m8hqexYfmgE 3tj4PK/SnlHdlmxRT53Z9+afs4A9GhaitShN4tTI+iYm+KEWQsrLr483U7tK7pj8ZqzsVLTg8 Ar0nCuKXbq2nRk0fYtES3p+CFxbKF6MrF0YOYqagtp0LgjtyZsgDaeTgjhN0iDQiVf79cC6Wy 4S2iEEsuQwTwKmRO Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 15 October 2015 14:51:42 Stephen Rothwell wrote: > 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. > I've added a workaround to the asm-generic tree, no need to worry about it for now. We can change over the remaining users of asm-generic/io-64-nonatomic-lo-hi.h for the following merge window and then remove the wrapper. Arnd