From: Shuah Khan <skhan@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Shuah Khan <shuah@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Ryan Roberts <ryan.roberts@arm.com>,
Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the kselftest tree with the mm tree
Date: Sat, 27 Apr 2024 03:27:41 -0600 [thread overview]
Message-ID: <f872c56b-ed45-4b45-8c40-52ddb3f2c809@linuxfoundation.org> (raw)
In-Reply-To: <20240426154414.4d408fd7@canb.auug.org.au>
On 4/25/24 23:44, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kselftest tree got a conflict in:
>
> tools/testing/selftests/mm/soft-dirty.c
>
> between commit:
>
> 258ff696db6b ("selftests/mm: soft-dirty should fail if a testcase fails")
>
> from the mm-unstable branch of the mm tree and commit:
>
> e6162a96c81d ("selftests/mm: ksft_exit functions do not return")
>
> from the kselftest tree.
>
> I fixed it up (I used the former) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
Thank you Stephen. I will keep track of this when I send pull request to Linus.
thanks,
-- Shuah
prev parent reply other threads:[~2024-04-27 9:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-26 5:44 linux-next: manual merge of the kselftest tree with the mm tree Stephen Rothwell
2024-04-27 9:27 ` Shuah Khan [this message]
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=f872c56b-ed45-4b45-8c40-52ddb3f2c809@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=ryan.roberts@arm.com \
--cc=sfr@canb.auug.org.au \
--cc=shuah@kernel.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).