Date:   Tue, 21 Feb 2023 17:50:21 +1100
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
Message-ID: <20230221175021.76bb2301@canb.auug.org.au>
In-Reply-To: <CAH2r5ms6J_hWmLaLA=pCQz1oez3bO07ahvr6mdCbYzQHrNVNkA@mail.gmail.com>
References: <20230220152933.1ab8fa4a@canb.auug.org.au>
        <Y/N8hVWeR3AjssUC@casper.infradead.org>
        <20230220190157.3b43b9a7@canb.auug.org.au>
        <CAH2r5ms6J_hWmLaLA=pCQz1oez3bO07ahvr6mdCbYzQHrNVNkA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/smEwGU=AnBx_Fyplh7lH/A.";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/smEwGU=AnBx_Fyplh7lH/A.
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.
--=20
Cheers,
Stephen Rothwell

--Sig_/smEwGU=AnBx_Fyplh7lH/A.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmP0aa0ACgkQAVBC80lX
0GwVKAf/VDbAZrvuL6B4uaQHBuUNR1OPnJWAwAJ/ZKw2EmsDb4nifmeMdyCooU8n
pVoGxR08i3mX71D+QAWakA4zu33rPsuoGsktcXdo48dfIH46PzkUh+/MMipRqTNc
mP2UNsQqF8ppi4pAOnD4wLEx8QOzM1L7xAPiOoMLemqtdJWsIsvN0yCUiwJOZHZt
S1dcT+1ovBNTeUGVflE6eMDhLx5Yo7l44h3CDIM4TU8+sD1YkNwXE8x3DEk6TK9Z
G3JS93JGATN86ueRG0unX2RKA19Ek5FnnALKBZToi4ExQzMgsezeid4t/NsPIwhf
OvEmBzKGvNpkqrGTxalPcLJwmgK1Rw==
=JA4/
-----END PGP SIGNATURE-----

--Sig_/smEwGU=AnBx_Fyplh7lH/A.--