Re: linux-next: manual merge of the folio tree with the asm-generic tree

[Stephen Rothwell]

Hi a;;,

On Thu, 3 Mar 2022 17:24:27 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the folio tree got a conflict in:
> 
>   arch/nds32/include/asm/pgtable.h
> 
> between commit:
> 
>   9f15ac318b83 ("nds32: Remove the architecture")
> 
> from the asm-generic tree and commit:
> 
>   e558a885a525 ("arch: Add pmd_pfn() where it is missing")
> 
> from the folio tree.
> 
> I fixed it up (I just deleted the file) 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.

This is now a conflict between the asm-generic tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpIH180AiBk3.pgp
Description: OpenPGP digital signature