From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: Re: linux-next: Tree for Oct 30 (include/xen/swiotlb-xen.h) Date: Mon, 4 Nov 2013 18:14:26 +0000 Message-ID: References: <20131030184511.c90aa7f40fec6b2e1652f394@canb.auug.org.au> <527153A3.5020404@infradead.org> <20131101193720.GB15622@phenom.dumpdata.com> Mime-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Return-path: Received: from smtp.citrix.com ([66.165.176.89]:42050 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750746Ab3KDSPn (ORCPT ); Mon, 4 Nov 2013 13:15:43 -0500 In-Reply-To: <20131101193720.GB15622@phenom.dumpdata.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Konrad Rzeszutek Wilk Cc: Randy Dunlap , Stefano Stabellini , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org On Fri, 1 Nov 2013, Konrad Rzeszutek Wilk wrote: > On Wed, Oct 30, 2013 at 11:44:51AM -0700, Randy Dunlap wrote: > > On 10/30/13 00:45, Stephen Rothwell wrote: > > > Hi all, > > > > > > News: I am now doing an arm multi_v7_defconfig build between each merge. > > > > > > Changes since 20131029: > > > > > > The arm defconfig build is fixed again. > > > > > > The net-next tree gained a conflict against the net tree. > > > > > > The xen-tip tree gained a conflict against the arm tree. > > > > > > The akpm-current tree gained a conflict against the tip tree and a build > > > failure for which I reverted 3 commits. > > > > > > Various build problems from yesterday have been resolved. > > > > on x86_64: > > Stefano, please fix that. Thanks for the notification. I am appending the fix that I am about to apply to xentip/linux-next. commit bb5ebdb6a674c59cd7b5d159d6ca3c0084ee60e1 Author: Stefano Stabellini Date: Mon Nov 4 17:54:27 2013 +0000 swiotlb-xen: missing include dma-direction.h Signed-off-by: Stefano Stabellini diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h index 7b64465..8b2eb93 100644 --- a/include/xen/swiotlb-xen.h +++ b/include/xen/swiotlb-xen.h @@ -1,6 +1,7 @@ #ifndef __LINUX_SWIOTLB_XEN_H #define __LINUX_SWIOTLB_XEN_H +#include #include extern int xen_swiotlb_init(int verbose, bool early);