* linux-next: manual merge of the tip tree with the mm tree
@ 2023-03-21 23:33 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2023-03-21 23:33 UTC (permalink / raw
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Andrew Morton
Cc: Axel Rasmussen, Dave Hansen, Linux Kernel Mailing List,
Linux Next Mailing List, Rick Edgecombe
[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
mm/userfaultfd.c
between commit:
a3b8390c1550 ("mm: userfaultfd: combine 'mode' and 'wp_copy' arguments")
from the mm tree and commit:
74fd30bd28e4 ("mm: Make pte_mkwrite() take a VMA")
from the tip tree.
I fixed it up (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.
--
Cheers,
Stephen Rothwell
diff --cc mm/userfaultfd.c
index 7f1b5f8b712c,3db6f87c0aca..000000000000
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@@ -76,8 -75,8 +76,8 @@@ int mfill_atomic_install_pte(pmd_t *dst
if (page_in_cache && !vm_shared)
writable = false;
if (writable)
- _dst_pte = pte_mkwrite(_dst_pte);
+ _dst_pte = pte_mkwrite(_dst_pte, dst_vma);
- if (wp_copy)
+ if (flags & MFILL_ATOMIC_WP)
_dst_pte = pte_mkuffd_wp(_dst_pte);
dst_pte = pte_offset_map_lock(dst_mm, dst_pmd, dst_addr, &ptl);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the tip tree with the mm tree
@ 2024-04-05 0:51 Stephen Rothwell
2024-04-07 23:50 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-04-05 0:51 UTC (permalink / raw
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Andrew Morton
Cc: Arnd Bergmann, Ingo Molnar, Linux Kernel Mailing List,
Linux Next Mailing List, Suren Baghdasaryan
[-- Attachment #1: Type: text/plain, Size: 1073 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/mm/numa_32.c
between commit:
d82a37ff6b88 ("fixup! fix missing vmalloc.h includes")
from the mm-unstable branch of the mm tree and commit:
9852b1dc6a14 ("x86/numa/32: Include missing <asm/pgtable_areas.h>")
from the tip tree.
I fixed it up (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.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/mm/numa_32.c
index e25e08ba4531,025fd7ea5d69..000000000000
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@@ -24,7 -24,7 +24,8 @@@
#include <linux/memblock.h>
#include <linux/init.h>
+#include <linux/vmalloc.h>
+ #include <asm/pgtable_areas.h>
#include "numa_internal.h"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the tip tree with the mm tree
2024-04-05 0:51 linux-next: manual merge of the tip tree with the mm tree Stephen Rothwell
@ 2024-04-07 23:50 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2024-04-07 23:50 UTC (permalink / raw
To: Andrew Morton
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Arnd Bergmann, Ingo Molnar, Linux Kernel Mailing List,
Linux Next Mailing List, Suren Baghdasaryan
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
Hi all,
On Fri, 5 Apr 2024 11:51:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/mm/numa_32.c
>
> between commit:
>
> d82a37ff6b88 ("fixup! fix missing vmalloc.h includes")
>
> from the mm-unstable branch of the mm tree and commit:
>
> 9852b1dc6a14 ("x86/numa/32: Include missing <asm/pgtable_areas.h>")
>
> from the tip tree.
>
> diff --cc arch/x86/mm/numa_32.c
> index e25e08ba4531,025fd7ea5d69..000000000000
> --- a/arch/x86/mm/numa_32.c
> +++ b/arch/x86/mm/numa_32.c
> @@@ -24,7 -24,7 +24,8 @@@
>
> #include <linux/memblock.h>
> #include <linux/init.h>
> +#include <linux/vmalloc.h>
> + #include <asm/pgtable_areas.h>
>
> #include "numa_internal.h"
>
This is now a conflict between commit
9852b1dc6a14 ("x86/numa/32: Include missing <asm/pgtable_areas.h>")
in Linus' tree and commit
a800a5095942 ("fixup! fix missing vmalloc.h includes")
from the mm-unstable branch of the mm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the tip tree with the mm tree
@ 2024-06-12 1:27 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2024-06-12 1:27 UTC (permalink / raw
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Andrew Morton
Cc: Borislav Petkov (AMD), Linux Kernel Mailing List,
Linux Next Mailing List, Tony Luck, Yury Norov
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/cacheinfo.h
between commit:
f6a9651bfd74 ("cpumask: make core headers including cpumask_types.h where possible")
from the mm-nonmm-unstable branch of the mm tree and commit:
685cb1674060 ("cacheinfo: Add function to get cacheinfo for a given CPU and cache level")
from the tip tree.
I fixed it up (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.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/cacheinfo.h
index 286db104e054,3dde175f4108..000000000000
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@@ -3,7 -3,8 +3,8 @@@
#define _LINUX_CACHEINFO_H
#include <linux/bitops.h>
+ #include <linux/cpuhplock.h>
-#include <linux/cpumask.h>
+#include <linux/cpumask_types.h>
#include <linux/smp.h>
struct device_node;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-12 1:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-05 0:51 linux-next: manual merge of the tip tree with the mm tree Stephen Rothwell
2024-04-07 23:50 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-06-12 1:27 Stephen Rothwell
2023-03-21 23:33 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 read-only IMAP folder(s) and NNTP newsgroup(s).