From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Gortmaker Subject: Bad ux500 merge fix leads to linux-next failure Date: Tue, 22 May 2012 20:03:46 -0400 Message-ID: <20120523000346.GB3610@windriver.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: Received: from mail.windriver.com ([147.11.1.11]:52398 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757749Ab2EWAD7 (ORCPT ); Tue, 22 May 2012 20:03:59 -0400 Content-Disposition: inline Sender: linux-next-owner@vger.kernel.org List-ID: To: Olof Johansson Cc: linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org 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 Date: Wed May 16 14:47:24 2012 -0700 ARM: ux500: fix mismerge in for-next Signed-off-by: Olof Johansson :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. From mboxrd@z Thu Jan 1 00:00:00 1970 From: paul.gortmaker@windriver.com (Paul Gortmaker) Date: Tue, 22 May 2012 20:03:46 -0400 Subject: Bad ux500 merge fix leads to linux-next failure Message-ID: <20120523000346.GB3610@windriver.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 Date: Wed May 16 14:47:24 2012 -0700 ARM: ux500: fix mismerge in for-next Signed-off-by: Olof Johansson :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.