From: Michael Ellerman <mpe@ellerman.id.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Shuah Khan <shuahkh@osg.samsung.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the kselftest tree with the kselftest-fixes tree
Date: Wed, 03 Dec 2014 22:56:37 +1100 [thread overview]
Message-ID: <1417607797.23663.1.camel@concordia> (raw)
In-Reply-To: <20141203203210.2eef1e6c@canb.auug.org.au>
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?
cheers
next prev parent reply other threads:[~2014-12-03 11:56 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 [this message]
2014-12-03 14:09 ` Shuah Khan
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=1417607797.23663.1.camel@concordia \
--to=mpe@ellerman.id.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shuahkh@osg.samsung.com \
/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