From: Shuah Khan <shuahkh@osg•samsung.com>
To: Michael Ellerman <mpe@ellerman•id.au>,
Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Shuah Khan <shuahkh@osg•samsung.com>
Subject: Re: linux-next: manual merge of the kselftest tree with the kselftest-fixes tree
Date: Wed, 03 Dec 2014 07:09:30 -0700 [thread overview]
Message-ID: <547F199A.3020600@osg.samsung.com> (raw)
In-Reply-To: <1417607797.23663.1.camel@concordia>
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
thanks,
-- Shuah
--
Shuah Khan
Sr. Linux Kernel Developer
Samsung Research America (Silicon Valley)
shuahkh@osg•samsung.com | (970) 217-8978
next prev parent reply other threads:[~2014-12-03 14:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-03 9:32 linux-next: manual merge of the kselftest tree with the kselftest-fixes tree Stephen Rothwell
2014-12-03 11:56 ` Michael Ellerman
2014-12-03 14:09 ` Shuah Khan [this message]
2014-12-03 15:51 ` Shuah Khan
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=547F199A.3020600@osg.samsung.com \
--to=shuahkh@osg$(echo .)samsung.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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