From: Christoph Hellwig <hch@lst.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Christoph Hellwig <hch@lst.de>,
Matthew Wilcox <willy@infradead.org>,
mm-commits@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Lorenzo Stoakes <lstoakes@gmail.com>,
Vlastimil Babka <vbabka@suse.cz>
Subject: Re: [GIT PULL] MM updates for 6.4-rc1
Date: Fri, 28 Apr 2023 07:36:54 +0200 [thread overview]
Message-ID: <20230428053654.GA8549@lst.de> (raw)
In-Reply-To: <CAHk-=wjaYXeWKsyifQCS=gJf4mxav-b6cdf5boKpMO6M1C-2LQ@mail.gmail.com>
On Thu, Apr 27, 2023 at 08:15:56PM -0700, Linus Torvalds wrote:
> Most of the bulk of the conflicts were around __filemap_get_folio()
> now returning an ERR_PTR, particularly then with Willy doing the ext4
> folio conversion.
>
> So Christoph, Willy, mind just double-checking me?
The merge looks fine to me.
next prev parent reply other threads:[~2023-04-28 5:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-27 22:33 [GIT PULL] MM updates for 6.4-rc1 Andrew Morton
2023-04-28 3:03 ` Linus Torvalds
2023-04-28 16:03 ` Suren Baghdasaryan
2023-04-28 16:08 ` Linus Torvalds
2023-04-28 16:14 ` Suren Baghdasaryan
2023-04-28 16:17 ` Suren Baghdasaryan
2023-04-28 16:20 ` Linus Torvalds
2023-04-28 17:38 ` Suren Baghdasaryan
2023-04-28 3:09 ` pr-tracker-bot
2023-04-28 3:15 ` Linus Torvalds
2023-04-28 3:24 ` Linus Torvalds
2023-04-28 5:36 ` Christoph Hellwig [this message]
2023-05-04 10:39 ` Niklas Cassel
2023-05-05 2:10 ` Andrew Morton
2023-05-05 14:28 ` Keith Busch
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=20230428053654.GA8549@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lstoakes@gmail.com \
--cc=mm-commits@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=vbabka@suse.cz \
--cc=willy@infradead.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.