From: paul.gortmaker@windriver.com (Paul Gortmaker)
To: linux-arm-kernel@lists.infradead.org
Subject: Bad ux500 merge fix leads to linux-next failure
Date: Tue, 22 May 2012 20:03:46 -0400 [thread overview]
Message-ID: <20120523000346.GB3610@windriver.com> (raw)
Hi Olof,
This change:
- id.o usb.o timer.o
+ id.o pins.o usb.o timer.o
breaks the u8500_defconfig as follows:
make[2]: *** No rule to make target `arch/arm/mach-ux500/pins.o', needed
by `arch/arm/mach-ux500/built-in.o'. Stop.
make[1]: *** [arch/arm/mach-ux500/] Error 2
make: *** [sub-make] Error 2
A bisect shows the following:
cda6f4d8cae969e08e6662573b538db73191873b is the first bad commit
commit cda6f4d8cae969e08e6662573b538db73191873b
Author: Olof Johansson <olof@lixom.net>
Date: Wed May 16 14:47:24 2012 -0700
ARM: ux500: fix mismerge in for-next
Signed-off-by: Olof Johansson <olof@lixom.net>
:040000 040000 abc42227f7daa6a7ff6153e0908add25ffb38a54
45d2618822e6075aea188089191791091c2e5c38 M arch
bisect run success
The linux-next fail is here:
http://kisskb.ellerman.id.au/kisskb/buildresult/6348609/
Can you have a look please?
Thanks,
Paul.
next reply other threads:[~2012-05-23 0:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-23 0:03 Paul Gortmaker [this message]
2012-05-23 0:10 ` Bad ux500 merge fix leads to linux-next failure Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120523000346.GB3610@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox