mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Sasha Levin <sashal@kernel.org>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Carlos Maiolino <cem@kernel.org>,
	David Hildenbrand <david@kernel.org>,
	Mike Rapoport <rppt@kernel.org>,
	Vlastimil Babka <vbabka@kernel.org>,
	linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the fs-next tree with the mm tree
Date: Mon, 19 Oct 2026 14:00:01 +0100	[thread overview]
Message-ID: <atYUUdnkCxX7ZQ__@sirena.co.uk> (raw)
In-Reply-To: <20261019114806.1298980-1-sashal@kernel.org>

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]

On Mon, Oct 19, 2026 at 07:48:05AM -0400, Sasha Levin wrote:
> On Mon, Sep 28, 2026 at 01:48:14PM +0100, Mark Brown wrote:
> > There is a fixup in -next already which is hopefully OK, I don't recall
> > it being especially bad so probably Linus would be OK with resolving it.
> 
> Hi Mark,
> 
> The fixup in -next takes the mm side of xfs_btree_split_worker()
> verbatim, which puts xfs_trans_set_context()/xfs_trans_clear_context()
> back and drops

Thanks for these.

If you have fixups for merges in -next it's much easier if you can send
an incremental fixup against the merge rather than a completely fresh
merge, the tooling uses a rerere cache so unless there's a new conflict
in the same place it's hard to get back to the original conflict.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

  parent reply	other threads:[~2026-10-19 13:00 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-24 12:09 Mark Brown
2026-09-25 12:26 ` Carlos Maiolino
2026-09-25 13:11   ` Mark Brown
2026-09-25 15:03     ` Carlos Maiolino
2026-09-25 21:14       ` Andrew Morton
2026-09-28 12:26         ` Kefeng Wang
2026-09-28 12:48           ` Mark Brown
2026-10-19 11:48             ` Sasha Levin
2026-10-19 12:50               ` Carlos Maiolino
2026-10-19 13:00               ` Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-09-23 10:08 Mark Brown
2026-09-17 14:48 Mark Brown
2026-09-17 14:48 Mark Brown
2026-09-17 14:48 Mark Brown
2026-09-17 19:13 ` Andrew Morton
2026-09-17 21:22   ` Jaegeuk Kim

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=atYUUdnkCxX7ZQ__@sirena.co.uk \
    --to=broonie@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=cem@kernel.org \
    --cc=david@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rppt@kernel.org \
    --cc=sashal@kernel.org \
    --cc=vbabka@kernel.org \
    --cc=wangkefeng.wang@huawei.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
all inboxes | Powered by JetHome®