* linux-next: build failure after merge of the iommu tree
@ 2014-11-05 2:47 Stephen Rothwell
2014-11-05 11:16 ` Joerg Roedel
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-11-05 2:47 UTC (permalink / raw)
To: Joerg Roedel; +Cc: Olav Haugan, linux-next, ppc-dev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
Hi Joerg,
After merging the iommu tree, today's linux-next build (powerpc
pc64_defconfig) failed like this:
In file included from arch/powerpc/platforms/powernv/pci.c:33:0:
arch/powerpc/include/asm/iommu.h:140:12: error: conflicting types for 'iommu_map_sg'
extern int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
^
In file included from arch/powerpc/platforms/powernv/pci.c:23:0:
include/linux/iommu.h:311:22: note: previous definition of 'iommu_map_sg' was here
static inline size_t iommu_map_sg(struct iommu_domain *domain,
^
Caused by commit 315786ebbf4a ("iommu: Add iommu_map_sg() function").
Grep is your friend ...
I have used the iommu tree from next-20141104 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: build failure after merge of the iommu tree
2014-11-05 2:47 linux-next: build failure after merge of the iommu tree Stephen Rothwell
@ 2014-11-05 11:16 ` Joerg Roedel
0 siblings, 0 replies; 2+ messages in thread
From: Joerg Roedel @ 2014-11-05 11:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Olav Haugan, linux-next, ppc-dev, linux-kernel
On Wed, Nov 05, 2014 at 01:47:31PM +1100, Stephen Rothwell wrote:
> Hi Joerg,
>
> After merging the iommu tree, today's linux-next build (powerpc
> pc64_defconfig) failed like this:
>
> In file included from arch/powerpc/platforms/powernv/pci.c:33:0:
> arch/powerpc/include/asm/iommu.h:140:12: error: conflicting types for 'iommu_map_sg'
> extern int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
> ^
> In file included from arch/powerpc/platforms/powernv/pci.c:23:0:
> include/linux/iommu.h:311:22: note: previous definition of 'iommu_map_sg' was here
> static inline size_t iommu_map_sg(struct iommu_domain *domain,
> ^
>
> Caused by commit 315786ebbf4a ("iommu: Add iommu_map_sg() function").
> Grep is your friend ...
>
> I have used the iommu tree from next-20141104 for today.
Thanks Stephen, I exluded the my core branch from next for now until the
issue is fixed.
Joerg
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-05 11:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-05 2:47 linux-next: build failure after merge of the iommu tree Stephen Rothwell
2014-11-05 11:16 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).