linux-kernel - Re: linux-next: build failure after merge of the v4l-dvb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150413130557.75fc7f0f@canb.auug.org.au>
Date:	Mon, 13 Apr 2015 13:05:57 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Laurent Pinchart <laurent.pinchart@...asonboard.com>
Cc:	Mauro Carvalho Chehab <mchehab@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hyun Kwon <hyun.kwon@...inx.com>,
	Radhey Shyam Pandey <radheys@...inx.com>,
	Michal Simek <michal.simek@...inx.com>,
	Hans Verkuil <hans.verkuil@...co.com>
Subject: Re: linux-next: build failure after merge of the v4l-dvb tree

Hi Laurent,

On Fri, 10 Apr 2015 15:45:11 +0300 Laurent Pinchart <laurent.pinchart@...asonboard.com> wrote:
>
> On Friday 10 April 2015 20:11:43 Stephen Rothwell wrote:
> > Hi Mauro,
> > 
> > After merging the v4l-dvb tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/media/platform/xilinx/xilinx-dma.c:15:35: fatal error:
> > linux/amba/xilinx_dma.h: No such file or directory #include
> > <linux/amba/xilinx_dma.h>
> >                                    ^
> > 
> > Caused by commit df3305156f98 ("[media] v4l: xilinx: Add Xilinx Video
> > IP core").
> > 
> > I have reverted that commit (and the 2 following it) for today.
> 
> linux/amba/xilinx_dma.h has been moved to linux/dma/xilinx_dma.h by
> 
> commit 937abe88aea3161cd3a563e577fc9cf4522c7aad
> Author: Kedareswara rao Appana <appana.durga.rao@...inx.com>
> Date:   Mon Mar 2 23:24:24 2015 +0530
> 
>     dmaengine: xilinx-dma: move header file to common location
>     
>     This patch moves the xilinx_dma.h header file
>     to the include/linux/dma.
>     
>     Signed-off-by: Kedareswara rao Appana <appanad@...inx.com>
>     Signed-off-by: Vinod Koul <vinod.koul@...el.com>
> 
> Could you update the path instead of reverting the commits ?

I applied this:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 13 Apr 2015 12:48:27 +1000
Subject: [PATCH] v4l: xilinx: fix for include file movement

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/media/platform/xilinx/xilinx-dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index 10209c294168..efde88adf624 100644
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -12,7 +12,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/amba/xilinx_dma.h>
+#include <linux/dma/xilinx_dma.h>
 #include <linux/lcm.h>
 #include <linux/list.h>
 #include <linux/module.h>
-- 
2.1.4


Someone needs to tell Linus when the merge happens.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped