* arch/arm broken in next
@ 2010-02-27 20:33 Uwe Kleine-König
2010-02-27 23:12 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Uwe Kleine-König @ 2010-02-27 20:33 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
since
40464e5 (Merge remote branch 'samsung/next-samsung')
next is broken for arch/arm. Our autobuilders fail with:
arch/arm/Kconfig:920: file 'arch/arm/mach-lh7a40x/Kconfig' is already sourced from 'arch/arm/Kconfig'
Both parents of 40464e5 only include the above file once.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 3+ messages in thread
* arch/arm broken in next
2010-02-27 20:33 arch/arm broken in next Uwe Kleine-König
@ 2010-02-27 23:12 ` Stephen Rothwell
2010-02-28 10:34 ` Uwe Kleine-König
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-02-27 23:12 UTC (permalink / raw)
To: linux-arm-kernel
Hi Uwe,
On Sat, 27 Feb 2010 21:33:45 +0100 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> wrote:
>
> since
>
> 40464e5 (Merge remote branch 'samsung/next-samsung')
>
> next is broken for arch/arm. Our autobuilders fail with:
>
> arch/arm/Kconfig:920: file 'arch/arm/mach-lh7a40x/Kconfig' is already sourced from 'arch/arm/Kconfig'
>
> Both parents of 40464e5 only include the above file once.
Yeah, sorry about that. This is one of those rare cases where the
automatic git merge got it wrong. I will make sure it doesn't happen for
the next release. The correct resolution should not include the second
inclusion.
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100228/285a05ae/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
* arch/arm broken in next
2010-02-27 23:12 ` Stephen Rothwell
@ 2010-02-28 10:34 ` Uwe Kleine-König
0 siblings, 0 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2010-02-28 10:34 UTC (permalink / raw)
To: linux-arm-kernel
Hi Stephen,
On Sun, Feb 28, 2010 at 10:12:39AM +1100, Stephen Rothwell wrote:
> On Sat, 27 Feb 2010 21:33:45 +0100 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> wrote:
> >
> > since
> >
> > 40464e5 (Merge remote branch 'samsung/next-samsung')
> >
> > next is broken for arch/arm. Our autobuilders fail with:
> >
> > arch/arm/Kconfig:920: file 'arch/arm/mach-lh7a40x/Kconfig' is already sourced from 'arch/arm/Kconfig'
> >
> > Both parents of 40464e5 only include the above file once.
>
> Yeah, sorry about that.
No problem, thanks to you for doing the work to maintain next.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-02-28 10:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-27 20:33 arch/arm broken in next Uwe Kleine-König
2010-02-27 23:12 ` Stephen Rothwell
2010-02-28 10:34 ` Uwe Kleine-König
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).