* linux-next: manual merge of the folio tree with the asm-generic tree
@ 2022-03-03 6:24 Stephen Rothwell
2022-03-23 22:15 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-03-03 6:24 UTC (permalink / raw)
To: Matthew Wilcox, Arnd Bergmann
Cc: Alan Kao, Linux Kernel Mailing List, Linux Next Mailing List,
Mike Rapoport, Mike Rapoport
[-- Attachment #1: Type: text/plain, Size: 736 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the folio tree with the asm-generic tree
2022-03-03 6:24 linux-next: manual merge of the folio tree with the asm-generic tree Stephen Rothwell
@ 2022-03-23 22:15 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-03-23 22:15 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Matthew Wilcox, Alan Kao, Linux Kernel Mailing List,
Linux Next Mailing List, Mike Rapoport, Mike Rapoport
[-- Attachment #1: Type: text/plain, Size: 933 bytes --]
Hi a;;,
On Thu, 3 Mar 2022 17:24:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-23 22:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-03 6:24 linux-next: manual merge of the folio tree with the asm-generic tree Stephen Rothwell
2022-03-23 22:15 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).