From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Manuel Ebner <manuelebner@mailbox.org>,
Stanislav Kinsburskii <skinsburskii@gmail.com>
Subject: Re: linux-next: manual merge of the jc_docs tree with the mm-unstable tree
Date: Wed, 15 Jul 2026 09:20:29 -0700 [thread overview]
Message-ID: <20260715092029.18a9334f73e3b1517f3d47b3@linux-foundation.org> (raw)
In-Reply-To: <alep4zhJYFTXqBe9@sirena.org.uk>
On Wed, 15 Jul 2026 16:40:19 +0100 Mark Brown <broonie@kernel.org> wrote:
> Hi all,
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/mm/hmm.rst
>
> between commits:
>
> 3862d3b51eb1f ("mm/hmm: add hmm_range_fault_unlocked_timeout() for mmap lock-drop support")
> 94e4afa33bac3 ("mm-hmm-add-hmm_range_fault_unlocked_timeout-for-mmap-lock-drop-support-fix")
>
> from the mm-unstable tree and commit:
>
> e834ee8e571d5 ("docs/mm: Fix braces")
>
> from the jc_docs 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.
There was no "see below".
Jon, that little patch is being a problem. Maybe drop it and I can fix
it up and carry it in mm.git?
next prev parent reply other threads:[~2026-07-15 16:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-15 15:40 Mark Brown
2026-07-15 16:20 ` Andrew Morton [this message]
2026-07-15 16:43 ` Mark Brown
2026-07-15 16:53 ` Jonathan Corbet
-- strict thread matches above, loose matches on Subject: below --
2026-07-14 12:25 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=20260715092029.18a9334f73e3b1517f3d47b3@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=manuelebner@mailbox.org \
--cc=skinsburskii@gmail.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®