From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steve French <smfrench@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
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>,
Steve French <stfrench@microsoft.com>,
"Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Subject: Re: linux-next: manual merge of the mm-stable tree with the cifs tree
Date: Tue, 21 Feb 2023 17:50:21 +1100 [thread overview]
Message-ID: <20230221175021.76bb2301@canb.auug.org.au> (raw)
In-Reply-To: <CAH2r5ms6J_hWmLaLA=pCQz1oez3bO07ahvr6mdCbYzQHrNVNkA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 894 bytes --]
Hi Steve,
On Mon, 20 Feb 2023 15:00:50 -0600 Steve French <smfrench@gmail.com> wrote:
>
> I don't think it was so much that they were added late (most were
> reviewed over multiple week period) - just moved trees to make it
> easier a week ago. The changes David etc. have been making recently
> to the series seemed fairly small.
But they only turned up in linux-next over the weekend :-( So we are
only now finding out how they conflict badly with code that has been
published in the mm tree for weeks. So the combination has not been
tested at all. So it is really not ready to go into Linus' tree, right?
I am still using the cifs tree from next-20230217 - head commit
e18f461adf10 ("cifs: Fix uninitialized memory reads for oparms.mode")
because I don't know enough about the folio changes and the cifs
changes to merge them.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-02-21 6:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 4:29 linux-next: manual merge of the mm-stable tree with the cifs tree Stephen Rothwell
2023-02-20 13:58 ` 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 [this message]
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=20230221175021.76bb2301@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