From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Steve French <smfrench@gmail.com>
Cc: CIFS <linux-cifs@vger.kernel.org>,
David Howells <dhowells@redhat.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>,
Steve French <stfrench@microsoft.com>,
"Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Subject: linux-next: manual merge of the mm-stable tree with the cifs tree
Date: Mon, 20 Feb 2023 15:29:33 +1100 [thread overview]
Message-ID: <20230220152933.1ab8fa4a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
Hi all,
Today's linux-next merge of the mm-stable tree got a conflict in:
fs/cifs/file.c
between commit:
c8859bc0c129 ("cifs: Remove unused code")
from the cifs tree and commits:
4cda80f3a7a5 ("cifs: convert wdata_alloc_and_fillpages() to use filemap_get_folios_tag()")
d585bdbeb79a ("fs: convert writepage_t callback to pass a folio")
from the mm-stable tree.
This is a real mess :-(
I have no idea how to fix this up, so I have used the cifs tree from
next-20230217 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-02-20 4:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 4:29 Stephen Rothwell [this message]
2023-02-20 13:58 ` linux-next: manual merge of the mm-stable tree with the cifs tree Matthew Wilcox
2023-02-20 8:01 ` Stephen Rothwell
2023-02-20 20:58 ` Matthew Wilcox
2023-02-21 6:44 ` Stephen Rothwell
2023-02-21 7:19 ` David Howells
2023-02-21 7:42 ` Stephen Rothwell
2023-02-21 14:39 ` David Howells
2023-02-21 14:55 ` Matthew Wilcox
2023-02-21 15:05 ` David Howells
2023-02-21 15:26 ` Matthew Wilcox
2023-02-21 15:20 ` David Howells
2023-02-21 15:30 ` Obsolete comment on page swizzling (written by Hugh)? David Howells
[not found] ` <2890066.1676993700@warthog.procyon.org.uk>
2023-02-21 22:41 ` Hugh Dickins
2023-02-22 2:49 ` linux-next: manual merge of the mm-stable tree with the cifs tree Stephen Rothwell
2023-02-22 8:27 ` David Howells
2023-02-22 12:13 ` Stephen Rothwell
2023-02-20 21:00 ` Steve French
2023-02-21 6:50 ` Stephen Rothwell
2023-02-20 14:29 ` David Howells
2023-02-20 15:12 ` Matthew Wilcox
2023-02-20 8:05 ` 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=20230220152933.1ab8fa4a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=smfrench@gmail.com \
--cc=stfrench@microsoft.com \
--cc=vishal.moola@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox