From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>,
Disha Goel <disgoel@linux.ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the fs-next tree with the origin tree
Date: Fri, 4 Sep 2026 11:35:58 -0700 [thread overview]
Message-ID: <20260904113558.b8e68cf4ada8ee538ffafd76@linux-foundation.org> (raw)
In-Reply-To: <apsJzO0mzuBJhH8l@sirena.co.uk>
On Fri, 4 Sep 2026 19:11:24 +0100 Mark Brown <broonie@kernel.org> wrote:
> Hi all,
>
> Today's linux-next merge of the fs-next tree got a conflict in:
>
> tools/testing/selftests/Makefile
>
> between commit:
>
> 4ff32f084c158 ("selftests/filesystems: fix missing and stale TARGETS entries")
>
> from the origin tree and commit:
"origin tree"? I assume mm.git's mm-nonmm-unstable was intended.
>
> 5550456dad376 ("selftests/filesystems: Move file_stressor to dedicated subdirectory")
>
> from the fs-next tree.
>
> I fixed it up (see below) 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.
OK, thanks. I'll send "selftests/filesystems: fix missing and stale
TARGETS entries" over to Christian.
next prev parent reply other threads:[~2026-09-04 18:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-04 18:11 Mark Brown
2026-09-04 18:35 ` Andrew Morton [this message]
2026-09-04 18:42 ` Mark Brown
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=20260904113558.b8e68cf4ada8ee538ffafd76@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=disgoel@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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
all inboxes | Powered by JetHome®