Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751970AbaLCPvv (ORCPT ); Wed, 3 Dec 2014 10:51:51 -0500 Received: from lists.s-osg.org ([54.187.51.154]:39104 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbaLCPvt (ORCPT ); Wed, 3 Dec 2014 10:51:49 -0500 Message-ID: <547F3193.3040003@osg.samsung.com> Date: Wed, 03 Dec 2014 08:51:47 -0700 From: Shuah Khan Organization: Samsung Open Source Group User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Michael Ellerman , Stephen Rothwell CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shuah Khan Subject: Re: linux-next: manual merge of the kselftest tree with the kselftest-fixes tree References: <20141203203210.2eef1e6c@canb.auug.org.au> <1417607797.23663.1.camel@concordia> <547F199A.3020600@osg.samsung.com> In-Reply-To: <547F199A.3020600@osg.samsung.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/03/2014 07:09 AM, Shuah Khan wrote: > On 12/03/2014 04:56 AM, Michael Ellerman wrote: >> On Wed, 2014-12-03 at 20:32 +1100, Stephen Rothwell wrote: >>> Hi Shuah, >>> >>> Today's linux-next merge of the kselftest tree got a cselftests/kcmp: >>> Always try to build the testonflict in >>> tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff ("") >>> from the kselftest-fixes tree and commit c0d8a9393efd >>> ("selftests/kcmp: add install target to enable installing test") from >>> the kselftest tree. >> >> That got a bit mixed up, I think it should be: >> >> Today's linux-next merge of the kselftest tree got a conflict in >> tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff >> ("selftests/kcmp: Always try to build the test") from the kselftest-fixes >> tree and commit c0d8a9393efd ("selftests/kcmp: add install target to enable >> installing test") from the kselftest tree. >> >>> I fixed it up (see below - probably some more could be done) and can >>> carry the fix as necessary (no action is required). >> >> That resolution basically negates the effect of the first patch. >> >> Shuah, seeing these are both your trees are you happy to do the proper >> resolution? >> > > Stephen and Michael, > > I will sort this out. I have some patches in next that I should have > cleaned up yesterday when I applied commit 4c12df63f7ff. > > Sorry for the mix-up > Done. kselftes-next is clean now. -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Samsung Research America (Silicon Valley) shuahkh@osg.samsung.com | (970) 217-8978 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/