From: Rolf Eike Beer <eb@emlix.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Steven Price <steven.price@arm.com>
Subject: Re: linux-next: manual merge of the mm tree with Linus' tree
Date: Tue, 06 Sep 2022 11:21:56 +0200 [thread overview]
Message-ID: <1697463.OzeqPvCt3f@mobilepool36.emlix.com> (raw)
In-Reply-To: <20220906190141.028ea19a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
Am Dienstag, 6. September 2022, 11:01:41 CEST schrieb Stephen Rothwell:
> Hi all,
>
> Today's linux-next merge of the mm tree got a conflict in:
>
> mm/pagewalk.c
>
> between commit:
>
> 8782fb61cc84 ("mm: pagewalk: Fix race between unmap and page walker")
>
> from Linus' tree and commits:
>
> fa02fb928200 ("mm: pagewalk: make error checks more obvious")
> 66c217081bd0 ("mm: pagewalk: allow walk_page_range_novma() without mm")
>
> from the mm tree.
>
> I fixed it up (I think - 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.
Andrew,
please drop all my patches except the following 2 from your queue for now:
-mm: pagewalk: fix documentation of PTE hole handling
-mm: pagewalk: add api documentation for walk_page_range_novma()
Some of these patches are clearly outdated now with
8782fb61cc848364e1e1599d76d3c9dd58a1cc06 being included. I'll review them in
detail eventually and resubmit what is still relevant.
Regards,
Eike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 313 bytes --]
next prev parent reply other threads:[~2022-09-06 9:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 9:01 linux-next: manual merge of the mm tree with Linus' tree Stephen Rothwell
2022-09-06 9:21 ` Rolf Eike Beer [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-09 23:22 Stephen Rothwell
2023-07-27 23:18 Stephen Rothwell
2023-07-27 23:29 ` Stephen Rothwell
2023-07-27 23:40 ` Suren Baghdasaryan
2023-07-27 23:50 ` Matthew Wilcox
2023-07-28 0:08 ` Suren Baghdasaryan
2023-07-28 0:00 ` Stephen Rothwell
2023-07-28 3:13 ` Matthew Wilcox
2023-07-27 23:49 ` Matthew Wilcox
2023-07-28 0:21 ` Stephen Rothwell
2023-07-28 0:23 ` Suren Baghdasaryan
2023-07-28 0:29 ` Stephen Rothwell
2023-07-28 0:30 ` Suren Baghdasaryan
2023-07-06 22:54 Stephen Rothwell
2023-07-07 4:52 ` Baoquan He
2023-06-18 23:23 Stephen Rothwell
2023-06-19 20:25 ` Andrew Morton
2023-06-19 20:43 ` Will Deacon
2023-06-19 21:39 ` Andrew Morton
2023-06-20 9:43 ` Will Deacon
2023-06-20 15:00 ` Jain, Ayush
2023-02-24 23:39 Stephen Rothwell
2023-02-25 2:04 ` Andrew Morton
2023-02-25 7:13 ` Christian Brauner
2023-02-25 20:52 ` Andrew Morton
2023-02-27 10:18 ` Christian Brauner
2023-02-27 17:55 ` Andrew Morton
2022-11-07 2:52 Stephen Rothwell
2022-05-26 6:09 Stephen Rothwell
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=1697463.OzeqPvCt3f@mobilepool36.emlix.com \
--to=eb@emlix.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=steven.price@arm.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).