From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Shuah Khan <shuah@kernel•org>,
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: Wed, 15 May 2024 09:05:20 +1000 [thread overview]
Message-ID: <20240515090520.64d10d05@canb.auug.org.au> (raw)
In-Reply-To: <20240426154414.4d408fd7@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 992 bytes --]
Hi all,
On Fri, 26 Apr 2024 15:44:14 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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.
This is now a conflict between the mm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2024-05-14 23:05 UTC|newest]
Thread overview: 3+ 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
2024-05-14 23:05 ` Stephen Rothwell [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=20240515090520.64d10d05@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nathan@kernel$(echo .)org \
--cc=ryan.roberts@arm$(echo .)com \
--cc=shuah@kernel$(echo .)org \
--cc=skhan@linuxfoundation$(echo .)org \
/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