From: Mark Brown <broonie@kernel.org>
To: Andrew Morton <akpm@linux-foundation.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 19:42:17 +0100 [thread overview]
Message-ID: <apsRCXAwhTMK9Fis@sirena.co.uk> (raw)
In-Reply-To: <20260904113558.b8e68cf4ada8ee538ffafd76@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
On Fri, Sep 04, 2026 at 11:35:58AM -0700, Andrew Morton wrote:
> On Fri, 4 Sep 2026 19:11:24 +0100 Mark Brown <broonie@kernel.org> wrote:
> > 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.
gitk wasn't picking that up for some reason.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2026-09-04 18:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-04 18:11 linux-next: manual merge of the fs-next tree with the origin tree Mark Brown
2026-09-04 18:35 ` Andrew Morton
2026-09-04 18:42 ` Mark Brown [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=apsRCXAwhTMK9Fis@sirena.co.uk \
--to=broonie@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=brauner@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.