Date:   Tue, 21 Feb 2023 18:42:25 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Howells <dhowells@redhat.com>
Cc:     Matthew Wilcox <willy@infradead.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Steve French <smfrench@gmail.com>,
        CIFS <linux-cifs@vger.kernel.org>,
        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: <20230221184225.0e734f0e@canb.auug.org.au>
In-Reply-To: <2351091.1676963957@warthog.procyon.org.uk>
References: <20230221174401.7198357d@canb.auug.org.au>
        <20230220152933.1ab8fa4a@canb.auug.org.au>
        <Y/N8hVWeR3AjssUC@casper.infradead.org>
        <20230220190157.3b43b9a7@canb.auug.org.au>
        <Y/Pe2xHklSr1hDtz@casper.infradead.org>
        <2351091.1676963957@warthog.procyon.org.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/BQfQQmO37yFZXaMtd6DZd.r";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/BQfQQmO37yFZXaMtd6DZd.r
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi David,

On Tue, 21 Feb 2023 07:19:17 +0000 David Howells <dhowells@redhat.com> wrot=
e:
>
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>=20
> > in the cifs tree introduces a new usage of it in code that is used in
> > the cifs code ... so someone has to figure out what the merge
> > resolution is between the 2 trees (how to replace that new usage) and
> > let me know and then we need to test that combination for a while
> > before asking Linus to take it. =20
>=20
> It seems I can't fix my patch and give Steve a replacement patch because =
the
> new filemap_get_folios_tag() that I would need to use hasn't been added
> upstream yet.  Do we have any idea when the mm tree might land?

Andrew has already asked for it to be merged, so its up to Linus.

You could fetch it yourself and do a trial merge and send me your
resolution ..

git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-stable-2023-0=
2-20-13-37

--=20
Cheers,
Stephen Rothwell

--Sig_/BQfQQmO37yFZXaMtd6DZd.r
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmP0deEACgkQAVBC80lX
0Gy8agf+NF0EKA/5akG/J9oSYE2bLsctMt1AaZRa4fQtEEpPBmPM//r95sTGbIMd
V/UnrtBpjAlI5ibR6MCMGFK2PpXYZEqgKhl02988ggKRhlwrN/AwuN+uEKzlY0Sd
dAnQUW8RfqvgcwFmwD1tsxuJRM6HxXSccx8s8RGFaBlwzAhQiOh4/pyD0lsy/bhY
NGQTDDzTniZ2naiXJPESWJ1l2jOr+qQWoZOuwbcFjOH1na/78RKX3LZPj2e6hZ0u
Z0/foMjQiGmvfz0M5ulTghTkKEDOIiwpI33JYQsxKHypW2n76UTMMsrJkPnB3i5+
5PiAoW4a6sugyxAB1lGMAvoc0FixJg==
=gC/P
-----END PGP SIGNATURE-----

--Sig_/BQfQQmO37yFZXaMtd6DZd.r--