Hi Matthew,
On Tue, 21 Dec 2021 18:53:25 +0000 Matthew Wilcox <willy@xxxxxxxxxxxxx> wrote:
>
> 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):
>
> git://git.infradead.org/users/willy/linux.git folio-iomap
>
> 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.
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
* 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.
--
Cheers,
Stephen Rothwell
sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp1QePTvk4NV.pgp
Description: OpenPGP digital signature
