Re: linux-next: Tree for Oct 30 (include/xen/swiotlb-xen.h)
From: Randy Dunlap
Date: Mon Nov 04 2013 - 14:11:22 EST
On 11/04/13 10:14, Stefano Stabellini wrote:
> 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 <stefano.stabellini@xxxxxxxxxxxxx>
> Date: Mon Nov 4 17:54:27 2013 +0000
> swiotlb-xen: missing include dma-direction.h
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Thanks for both fixes.
> 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 <linux/dma-direction.h>
> #include <linux/swiotlb.h>
> extern int xen_swiotlb_init(int verbose, bool early);
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/