* next-20150604 build: 2 failures 37 warnings (next-20150604) [not found] <E1Z0YIL-0008Ma-5O@optimist> @ 2015-06-04 17:01 ` Mark Brown 2015-06-04 17:10 ` Tony Lindgren 0 siblings, 1 reply; 8+ messages in thread From: Mark Brown @ 2015-06-04 17:01 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jun 04, 2015 at 05:47:05PM +0100, Build bot for Mark Brown wrote: > arm-allmodconfig > ../drivers/tty/serial/8250/8250_omap.c:586:20: error: redefinition of 'omap8250_irq' Current -next fails to build an ARM allmodconfig (and possibly other things) due to 9e91597f24234 and 9809889c708eb (serial: 8250_omap: provide complete custom startup & shutdown callbacks) which appear to be the same commit that's been applied twice somehow. Not sure what's going on there... -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150604/76cb80de/attachment.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
* next-20150604 build: 2 failures 37 warnings (next-20150604) 2015-06-04 17:01 ` next-20150604 build: 2 failures 37 warnings (next-20150604) Mark Brown @ 2015-06-04 17:10 ` Tony Lindgren 2015-06-04 17:20 ` Tony Lindgren 0 siblings, 1 reply; 8+ messages in thread From: Tony Lindgren @ 2015-06-04 17:10 UTC (permalink / raw) To: linux-arm-kernel * Mark Brown <broonie@kernel.org> [150604 10:03]: > On Thu, Jun 04, 2015 at 05:47:05PM +0100, Build bot for Mark Brown wrote: > > > arm-allmodconfig > > ../drivers/tty/serial/8250/8250_omap.c:586:20: error: redefinition of 'omap8250_irq' > > Current -next fails to build an ARM allmodconfig (and possibly other > things) due to 9e91597f24234 and 9809889c708eb (serial: 8250_omap: > provide complete custom startup & shutdown callbacks) which appear to be > the same commit that's been applied twice somehow. Not sure what's > going on there... Sounds like I'm using an old commit in one of my pending branches, will check immediately. Regards, Tony ^ permalink raw reply [flat|nested] 8+ messages in thread
* next-20150604 build: 2 failures 37 warnings (next-20150604) 2015-06-04 17:10 ` Tony Lindgren @ 2015-06-04 17:20 ` Tony Lindgren 2015-06-04 17:57 ` Mark Brown 2015-06-05 10:49 ` Greg Kroah-Hartman 0 siblings, 2 replies; 8+ messages in thread From: Tony Lindgren @ 2015-06-04 17:20 UTC (permalink / raw) To: linux-arm-kernel * Tony Lindgren <tony@atomide.com> [150604 10:11]: > * Mark Brown <broonie@kernel.org> [150604 10:03]: > > On Thu, Jun 04, 2015 at 05:47:05PM +0100, Build bot for Mark Brown wrote: > > > > > arm-allmodconfig > > > ../drivers/tty/serial/8250/8250_omap.c:586:20: error: redefinition of 'omap8250_irq' > > > > Current -next fails to build an ARM allmodconfig (and possibly other > > things) due to 9e91597f24234 and 9809889c708eb (serial: 8250_omap: > > provide complete custom startup & shutdown callbacks) which appear to be > > the same commit that's been applied twice somehow. Not sure what's > > going on there... > > Sounds like I'm using an old commit in one of my pending branches, > will check immediately. Greg, there's now commit 9809889c708e in tty-linus and commit 9e91597f2423 in tty-next. I gues I'll drop my omap-for-v4.2/wakeirq branch from linux next for now. Regards, Tony ^ permalink raw reply [flat|nested] 8+ messages in thread
* next-20150604 build: 2 failures 37 warnings (next-20150604) 2015-06-04 17:20 ` Tony Lindgren @ 2015-06-04 17:57 ` Mark Brown 2015-06-05 10:49 ` Greg Kroah-Hartman 1 sibling, 0 replies; 8+ messages in thread From: Mark Brown @ 2015-06-04 17:57 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jun 04, 2015 at 10:20:26AM -0700, Tony Lindgren wrote: > * Tony Lindgren <tony@atomide.com> [150604 10:11]: > > Sounds like I'm using an old commit in one of my pending branches, > > will check immediately. > Greg, there's now commit 9809889c708e in tty-linus and commit > 9e91597f2423 in tty-next. Thanks for investigating! -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150604/95a83a33/attachment.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
* next-20150604 build: 2 failures 37 warnings (next-20150604) 2015-06-04 17:20 ` Tony Lindgren 2015-06-04 17:57 ` Mark Brown @ 2015-06-05 10:49 ` Greg Kroah-Hartman 2015-06-05 17:16 ` Mark Brown 1 sibling, 1 reply; 8+ messages in thread From: Greg Kroah-Hartman @ 2015-06-05 10:49 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jun 04, 2015 at 10:20:26AM -0700, Tony Lindgren wrote: > * Tony Lindgren <tony@atomide.com> [150604 10:11]: > > * Mark Brown <broonie@kernel.org> [150604 10:03]: > > > On Thu, Jun 04, 2015 at 05:47:05PM +0100, Build bot for Mark Brown wrote: > > > > > > > arm-allmodconfig > > > > ../drivers/tty/serial/8250/8250_omap.c:586:20: error: redefinition of 'omap8250_irq' > > > > > > Current -next fails to build an ARM allmodconfig (and possibly other > > > things) due to 9e91597f24234 and 9809889c708eb (serial: 8250_omap: > > > provide complete custom startup & shutdown callbacks) which appear to be > > > the same commit that's been applied twice somehow. Not sure what's > > > going on there... > > > > Sounds like I'm using an old commit in one of my pending branches, > > will check immediately. > > Greg, there's now commit 9809889c708e in tty-linus and commit > 9e91597f2423 in tty-next. Yes, I can't go back and remove the one in tty-next, I'm guessing when they are merged there is an issue. I'll look into that after Linus pulls in my tty-linus tree. thanks, greg k-h ^ permalink raw reply [flat|nested] 8+ messages in thread
* next-20150604 build: 2 failures 37 warnings (next-20150604) 2015-06-05 10:49 ` Greg Kroah-Hartman @ 2015-06-05 17:16 ` Mark Brown 2015-06-08 20:56 ` Greg Kroah-Hartman 0 siblings, 1 reply; 8+ messages in thread From: Mark Brown @ 2015-06-05 17:16 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jun 05, 2015 at 07:49:00PM +0900, Greg Kroah-Hartman wrote: > On Thu, Jun 04, 2015 at 10:20:26AM -0700, Tony Lindgren wrote: > > Greg, there's now commit 9809889c708e in tty-linus and commit > > 9e91597f2423 in tty-next. > Yes, I can't go back and remove the one in tty-next, I'm guessing when > they are merged there is an issue. I'll look into that after Linus > pulls in my tty-linus tree. Yeah, git isn't always spectacularly good at resolving add/add if there's context changes between two things in a merge - it sometimes ends up double adding things. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150605/bb03e390/attachment.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
* next-20150604 build: 2 failures 37 warnings (next-20150604) 2015-06-05 17:16 ` Mark Brown @ 2015-06-08 20:56 ` Greg Kroah-Hartman 2015-06-10 7:04 ` Tony Lindgren 0 siblings, 1 reply; 8+ messages in thread From: Greg Kroah-Hartman @ 2015-06-08 20:56 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jun 05, 2015 at 06:16:52PM +0100, Mark Brown wrote: > On Fri, Jun 05, 2015 at 07:49:00PM +0900, Greg Kroah-Hartman wrote: > > On Thu, Jun 04, 2015 at 10:20:26AM -0700, Tony Lindgren wrote: > > > > Greg, there's now commit 9809889c708e in tty-linus and commit > > > 9e91597f2423 in tty-next. > > > Yes, I can't go back and remove the one in tty-next, I'm guessing when > > they are merged there is an issue. I'll look into that after Linus > > pulls in my tty-linus tree. > > Yeah, git isn't always spectacularly good at resolving add/add if > there's context changes between two things in a merge - it sometimes > ends up double adding things. Ok, I've now merged these branches together, if someone can verify that my tty-next branch is correct, that would be great. thanks, greg k-h ^ permalink raw reply [flat|nested] 8+ messages in thread
* next-20150604 build: 2 failures 37 warnings (next-20150604) 2015-06-08 20:56 ` Greg Kroah-Hartman @ 2015-06-10 7:04 ` Tony Lindgren 0 siblings, 0 replies; 8+ messages in thread From: Tony Lindgren @ 2015-06-10 7:04 UTC (permalink / raw) To: linux-arm-kernel * Greg Kroah-Hartman <gregkh@linuxfoundation.org> [150608 13:58]: > On Fri, Jun 05, 2015 at 06:16:52PM +0100, Mark Brown wrote: > > On Fri, Jun 05, 2015 at 07:49:00PM +0900, Greg Kroah-Hartman wrote: > > > On Thu, Jun 04, 2015 at 10:20:26AM -0700, Tony Lindgren wrote: > > > > > > Greg, there's now commit 9809889c708e in tty-linus and commit > > > > 9e91597f2423 in tty-next. > > > > > Yes, I can't go back and remove the one in tty-next, I'm guessing when > > > they are merged there is an issue. I'll look into that after Linus > > > pulls in my tty-linus tree. > > > > Yeah, git isn't always spectacularly good at resolving add/add if > > there's context changes between two things in a merge - it sometimes > > ends up double adding things. > > Ok, I've now merged these branches together, if someone can verify that > my tty-next branch is correct, that would be great. I've verified that things are working for 8250_omap thanks. Tony ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-06-10 7:04 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1Z0YIL-0008Ma-5O@optimist>
2015-06-04 17:01 ` next-20150604 build: 2 failures 37 warnings (next-20150604) Mark Brown
2015-06-04 17:10 ` Tony Lindgren
2015-06-04 17:20 ` Tony Lindgren
2015-06-04 17:57 ` Mark Brown
2015-06-05 10:49 ` Greg Kroah-Hartman
2015-06-05 17:16 ` Mark Brown
2015-06-08 20:56 ` Greg Kroah-Hartman
2015-06-10 7:04 ` Tony Lindgren
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).