Date:   Wed, 22 Dec 2021 09:46:21 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Matthew Wilcox <willy@infradead.org>
Cc:     "Darrick J. Wong" <djwong@kernel.org>, linux-xfs@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
        Christoph Hellwig <hch@lst.de>,
        Dan Williams <dan.j.williams@intel.com>
Subject: Re: iomap-folio & nvdimm merge
Message-ID: <20211222094621.0de42c07@canb.auug.org.au>
In-Reply-To: <YcIipecYCUrqbRBu@casper.infradead.org>
References: <20211216210715.3801857-1-willy@infradead.org>
        <20211216210715.3801857-17-willy@infradead.org>
        <YcIIbtKhOulAL4s4@casper.infradead.org>
        <20211221184115.GY27664@magnolia>
        <YcIipecYCUrqbRBu@casper.infradead.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/v+fS+Q._F/DnpLkg4wl6AH1";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/v+fS+Q._F/DnpLkg4wl6AH1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Matthew,

On Tue, 21 Dec 2021 18:53:25 +0000 Matthew Wilcox <willy@infradead.org> wro=
te:
>
> Glad to hear it passed that thorough testing.  Stephen, please pick
> up a new tree (hopefully just temporarily until Darrick can swim to
> the surface):
>=20
>  git://git.infradead.org/users/willy/linux.git folio-iomap
>=20
> Hopefully the previous message will give you enough context for
> the merge conflict resolution.

I have added that after the folio tree today.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgement of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.=20

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
        Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and=20
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

--=20
Cheers,
Stephen Rothwell=20
sfr@canb.auug.org.au

--Sig_/v+fS+Q._F/DnpLkg4wl6AH1
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmHCWT0ACgkQAVBC80lX
0GzAGwf8DI9pHuTm4NgcBGUWaj+kLNj/Bv1JKijkd/qmbgPgehMdBvceEHMVN6iD
4+KVRpi38srP95wMD9Gv27tdoGejLfs223r6bp63lsCwQp9l13uDSCDMRZKnkjIw
WZjMMe5/y4z5Pl3B6m1hmD7+20KplPDdeCxKQiVYCgAHCnoDMG93JbIERNCsP4U2
GyHoRe9uSqssUK0GW9Q4i/rSZQcov7aZlvzNatGAfif2b7wxeOrgyGZj6tXaMov+
5x9llVh31pV6eJFMBfM4NlfAI0HQAk49t7nm8fabqS6n32DLypuU+Ns7EODQ1klt
ZediYJyMk3AQpviiOnhH70/gOGaPtw==
=dVTg
-----END PGP SIGNATURE-----

--Sig_/v+fS+Q._F/DnpLkg4wl6AH1--