From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Ard Biesheuvel <ardb@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Ma Wupeng <mawupeng1@huawei•com>, Peter Xu <peterx@redhat•com>
Subject: linux-next: manual merge of the mm tree with the efi tree
Date: Tue, 26 Jul 2022 19:46:43 +1000 [thread overview]
Message-ID: <20220726194643.47f6c020@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]
Hi all,
Today's linux-next merge of the mm tree got a conflict in:
mm/internal.h
between commit:
902c2d91582c ("memblock: Disable mirror feature if kernelcore is not specified")
from the efi tree and commit:
9a4722162210 ("mm/mprotect: fix soft-dirty check in can_change_pte_writable()")
from the mm 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/internal.h
index b73385df867d,e2d442e3c0b2..000000000000
--- a/mm/internal.h
+++ b/mm/internal.h
@@@ -862,6 -860,22 +860,24 @@@ struct folio *try_grab_folio(struct pag
DECLARE_PER_CPU(struct per_cpu_nodestat, boot_nodestats);
+extern bool mirrored_kernelcore;
+
+ static inline bool vma_soft_dirty_enabled(struct vm_area_struct *vma)
+ {
+ /*
+ * NOTE: we must check this before VM_SOFTDIRTY on soft-dirty
+ * enablements, because when without soft-dirty being compiled in,
+ * VM_SOFTDIRTY is defined as 0x0, then !(vm_flags & VM_SOFTDIRTY)
+ * will be constantly true.
+ */
+ if (!IS_ENABLED(CONFIG_MEM_SOFT_DIRTY))
+ return false;
+
+ /*
+ * Soft-dirty is kind of special: its tracking is enabled when the
+ * vma flags not set.
+ */
+ return !(vma->vm_flags & VM_SOFTDIRTY);
+ }
+
#endif /* __MM_INTERNAL_H */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2022-07-26 9:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220726194643.47f6c020@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=ardb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mawupeng1@huawei$(echo .)com \
--cc=peterx@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox