From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Eric Biggers <ebiggers@kernel•org>,
"Theodore Y. Ts'o" <tytso@mit•edu>
Cc: Eric Biggers <ebiggers@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead•org>
Subject: Re: linux-next: manual merge of the mm tree with the fsverity tree
Date: Thu, 19 Jan 2023 16:02:02 +1100 [thread overview]
Message-ID: <20230119160202.3de5506f@canb.auug.org.au> (raw)
In-Reply-To: <20230110132519.72181341@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 686 bytes --]
Hi all,
On Tue, 10 Jan 2023 13:25:19 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the mm tree got a conflict in:
>
> fs/buffer.c
>
> between commit:
>
> 2a042de143b2 ("fs/buffer.c: support fsverity in block_read_full_folio()")
this is now commit
4fa512ce7051 ("fs/buffer.c: support fsverity in block_read_full_folio()")
> from the fsverity tree and commit:
>
> a0ab20df28e6 ("buffer: replace obvious uses of b_page with b_folio")
this is now commit
abc8a8a2c7dc ("buffer: replace obvious uses of b_page with b_folio")
> from the mm tree.
from the mm-stable tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2023-01-19 5:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 2:25 linux-next: manual merge of the mm tree with the fsverity tree Stephen Rothwell
2023-01-19 5:02 ` Stephen Rothwell [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=20230119160202.3de5506f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=ebiggers@google$(echo .)com \
--cc=ebiggers@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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