* master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) [not found] <E1XFj9r-0003ZJ-40@cassiel.sirena.org.uk> @ 2014-08-08 14:32 ` Mark Brown 2014-08-11 10:00 ` Will Deacon 0 siblings, 1 reply; 7+ messages in thread From: Mark Brown @ 2014-08-08 14:32 UTC (permalink / raw) To: linux-arm-kernel On Fri, Aug 08, 2014 at 01:20:31PM +0100, Build bot for Mark Brown wrote: > Failed defconfigs: > arm64-allmodconfig # > Errors: > arm64-allmodconfig > ../arch/arm64/xen/../../arm/xen/grant-table.c:53:5: error: conflicting types for 'arch_gnttab_init' This build failure which was present in -next has now appeared in Linus' tree too. It appears to be the result of a mismerge, we have two definitions of the function, one from b7dd0e350e0bd (x86/xen: safely map and unmap grant frames when in atomic context) with the old signature and one from 438b33c7145ca8a5131 (xen/grant-table: remove support for V2 tables). -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140808/97b646b2/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) 2014-08-08 14:32 ` master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) Mark Brown @ 2014-08-11 10:00 ` Will Deacon 2014-08-11 10:40 ` David Vrabel 2014-08-11 10:41 ` Stefano Stabellini 0 siblings, 2 replies; 7+ messages in thread From: Will Deacon @ 2014-08-11 10:00 UTC (permalink / raw) To: linux-arm-kernel On Fri, Aug 08, 2014 at 03:32:27PM +0100, Mark Brown wrote: > On Fri, Aug 08, 2014 at 01:20:31PM +0100, Build bot for Mark Brown wrote: > > > Failed defconfigs: > > arm64-allmodconfig > # > > Errors: > > > arm64-allmodconfig > > ../arch/arm64/xen/../../arm/xen/grant-table.c:53:5: error: conflicting types for 'arch_gnttab_init' > > This build failure which was present in -next has now appeared in Linus' > tree too. It appears to be the result of a mismerge, we have two > definitions of the function, one from b7dd0e350e0bd (x86/xen: safely map > and unmap grant frames when in atomic context) with the old signature > and one from 438b33c7145ca8a5131 (xen/grant-table: remove support for V2 > tables). Stefano, Konrad: do you have a fix queued for this? I don't think there's a lot I can do from the arm64 side. Will ^ permalink raw reply [flat|nested] 7+ messages in thread
* master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) 2014-08-11 10:00 ` Will Deacon @ 2014-08-11 10:40 ` David Vrabel 2014-08-11 10:57 ` Stefano Stabellini 2014-08-11 10:41 ` Stefano Stabellini 1 sibling, 1 reply; 7+ messages in thread From: David Vrabel @ 2014-08-11 10:40 UTC (permalink / raw) To: linux-arm-kernel On 11/08/14 11:00, Will Deacon wrote: > On Fri, Aug 08, 2014 at 03:32:27PM +0100, Mark Brown wrote: >> On Fri, Aug 08, 2014 at 01:20:31PM +0100, Build bot for Mark Brown wrote: >> >>> Failed defconfigs: >>> arm64-allmodconfig >> # >>> Errors: >> >>> arm64-allmodconfig >>> ../arch/arm64/xen/../../arm/xen/grant-table.c:53:5: error: conflicting types for 'arch_gnttab_init' >> >> This build failure which was present in -next has now appeared in Linus' >> tree too. It appears to be the result of a mismerge, we have two >> definitions of the function, one from b7dd0e350e0bd (x86/xen: safely map >> and unmap grant frames when in atomic context) with the old signature >> and one from 438b33c7145ca8a5131 (xen/grant-table: remove support for V2 >> tables). > > Stefano, Konrad: do you have a fix queued for this? I don't think there's a > lot I can do from the arm64 side. I am going to apply this patch. 8<------------------------ arm/xen: remove duplicate arch_gnttab_init() function This was introduced in commit e306e3be1cbe (Merge tag 'stable/for-linus-3.17-rc0-tag'). Signed-off-by: David Vrabel <david.vrabel@citrix.com> --- arch/arm/xen/grant-table.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c index 2c4041c..e437918 100644 --- a/arch/arm/xen/grant-table.c +++ b/arch/arm/xen/grant-table.c @@ -49,8 +49,3 @@ int arch_gnttab_init(unsigned long nr_shared) { return 0; } - -int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status) -{ - return 0; -} -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) 2014-08-11 10:40 ` David Vrabel @ 2014-08-11 10:57 ` Stefano Stabellini 2014-08-11 11:04 ` Will Deacon 2014-08-13 12:45 ` Mark Brown 0 siblings, 2 replies; 7+ messages in thread From: Stefano Stabellini @ 2014-08-11 10:57 UTC (permalink / raw) To: linux-arm-kernel On Mon, 11 Aug 2014, David Vrabel wrote: > On 11/08/14 11:00, Will Deacon wrote: > > On Fri, Aug 08, 2014 at 03:32:27PM +0100, Mark Brown wrote: > >> On Fri, Aug 08, 2014 at 01:20:31PM +0100, Build bot for Mark Brown wrote: > >> > >>> Failed defconfigs: > >>> arm64-allmodconfig > >> # > >>> Errors: > >> > >>> arm64-allmodconfig > >>> ../arch/arm64/xen/../../arm/xen/grant-table.c:53:5: error: conflicting types for 'arch_gnttab_init' > >> > >> This build failure which was present in -next has now appeared in Linus' > >> tree too. It appears to be the result of a mismerge, we have two > >> definitions of the function, one from b7dd0e350e0bd (x86/xen: safely map > >> and unmap grant frames when in atomic context) with the old signature > >> and one from 438b33c7145ca8a5131 (xen/grant-table: remove support for V2 > >> tables). > > > > Stefano, Konrad: do you have a fix queued for this? I don't think there's a > > lot I can do from the arm64 side. > > I am going to apply this patch. > > 8<------------------------ > arm/xen: remove duplicate arch_gnttab_init() function > > This was introduced in commit e306e3be1cbe (Merge tag > 'stable/for-linus-3.17-rc0-tag'). > > Signed-off-by: David Vrabel <david.vrabel@citrix.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > arch/arm/xen/grant-table.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c > index 2c4041c..e437918 100644 > --- a/arch/arm/xen/grant-table.c > +++ b/arch/arm/xen/grant-table.c > @@ -49,8 +49,3 @@ int arch_gnttab_init(unsigned long nr_shared) > { > return 0; > } > - > -int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status) > -{ > - return 0; > -} > -- > 1.7.10.4 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) 2014-08-11 10:57 ` Stefano Stabellini @ 2014-08-11 11:04 ` Will Deacon 2014-08-13 12:45 ` Mark Brown 1 sibling, 0 replies; 7+ messages in thread From: Will Deacon @ 2014-08-11 11:04 UTC (permalink / raw) To: linux-arm-kernel On Mon, Aug 11, 2014 at 11:57:12AM +0100, Stefano Stabellini wrote: > On Mon, 11 Aug 2014, David Vrabel wrote: > > On 11/08/14 11:00, Will Deacon wrote: > > > On Fri, Aug 08, 2014 at 03:32:27PM +0100, Mark Brown wrote: > > >> On Fri, Aug 08, 2014 at 01:20:31PM +0100, Build bot for Mark Brown wrote: > > >> > > >>> Failed defconfigs: > > >>> arm64-allmodconfig > > >> # > > >>> Errors: > > >> > > >>> arm64-allmodconfig > > >>> ../arch/arm64/xen/../../arm/xen/grant-table.c:53:5: error: conflicting types for 'arch_gnttab_init' > > >> > > >> This build failure which was present in -next has now appeared in Linus' > > >> tree too. It appears to be the result of a mismerge, we have two > > >> definitions of the function, one from b7dd0e350e0bd (x86/xen: safely map > > >> and unmap grant frames when in atomic context) with the old signature > > >> and one from 438b33c7145ca8a5131 (xen/grant-table: remove support for V2 > > >> tables). > > > > > > Stefano, Konrad: do you have a fix queued for this? I don't think there's a > > > lot I can do from the arm64 side. > > > > I am going to apply this patch. > > > > 8<------------------------ > > arm/xen: remove duplicate arch_gnttab_init() function > > > > This was introduced in commit e306e3be1cbe (Merge tag > > 'stable/for-linus-3.17-rc0-tag'). > > > > Signed-off-by: David Vrabel <david.vrabel@citrix.com> > > Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Great, cheers guys. Will ^ permalink raw reply [flat|nested] 7+ messages in thread
* master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) 2014-08-11 10:57 ` Stefano Stabellini 2014-08-11 11:04 ` Will Deacon @ 2014-08-13 12:45 ` Mark Brown 1 sibling, 0 replies; 7+ messages in thread From: Mark Brown @ 2014-08-13 12:45 UTC (permalink / raw) To: linux-arm-kernel On Mon, Aug 11, 2014 at 11:57:12AM +0100, Stefano Stabellini wrote: > On Mon, 11 Aug 2014, David Vrabel wrote: > > I am going to apply this patch. > > 8<------------------------ > > arm/xen: remove duplicate arch_gnttab_init() function > > This was introduced in commit e306e3be1cbe (Merge tag > > 'stable/for-linus-3.17-rc0-tag'). > > Signed-off-by: David Vrabel <david.vrabel@citrix.com> > Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> This doesn't seem to have appeared in today's -next. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140813/fad19cc4/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) 2014-08-11 10:00 ` Will Deacon 2014-08-11 10:40 ` David Vrabel @ 2014-08-11 10:41 ` Stefano Stabellini 1 sibling, 0 replies; 7+ messages in thread From: Stefano Stabellini @ 2014-08-11 10:41 UTC (permalink / raw) To: linux-arm-kernel On Mon, 11 Aug 2014, Will Deacon wrote: > On Fri, Aug 08, 2014 at 03:32:27PM +0100, Mark Brown wrote: > > On Fri, Aug 08, 2014 at 01:20:31PM +0100, Build bot for Mark Brown wrote: > > > > > Failed defconfigs: > > > arm64-allmodconfig > > # > > > Errors: > > > > > arm64-allmodconfig > > > ../arch/arm64/xen/../../arm/xen/grant-table.c:53:5: error: conflicting types for 'arch_gnttab_init' > > > > This build failure which was present in -next has now appeared in Linus' > > tree too. It appears to be the result of a mismerge, we have two > > definitions of the function, one from b7dd0e350e0bd (x86/xen: safely map > > and unmap grant frames when in atomic context) with the old signature > > and one from 438b33c7145ca8a5131 (xen/grant-table: remove support for V2 > > tables). > > Stefano, Konrad: do you have a fix queued for this? I don't think there's a > lot I can do from the arm64 side. Will, I am aware of the issue. David should come up with a fix today. Otherwise I'll take care of it. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-08-13 12:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1XFj9r-0003ZJ-40@cassiel.sirena.org.uk>
2014-08-08 14:32 ` master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) Mark Brown
2014-08-11 10:00 ` Will Deacon
2014-08-11 10:40 ` David Vrabel
2014-08-11 10:57 ` Stefano Stabellini
2014-08-11 11:04 ` Will Deacon
2014-08-13 12:45 ` Mark Brown
2014-08-11 10:41 ` Stefano Stabellini
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.