Messages in this thread | | | Date | Mon, 14 Feb 2022 08:15:31 +0100 | From | Christoph Hellwig <> | Subject | Re: linux-next: manual merge of the block tree with the fscrypt tree |
| |
On Mon, Feb 14, 2022 at 12:11:39PM +1100, Stephen Rothwell wrote: > I fixed it up (I think - see below) and can carry the fix as necessary. > This is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts.
Thanks,
the fixup looks good to me.
| |