From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Matthew Wilcox <willy@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Yang Shi <shy828301@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the folio tree
Date: Mon, 1 Nov 2021 17:48:46 +1100 [thread overview]
Message-ID: <20211101174846.2b1097d7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]
Hi all,
After merging the folio tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
Caused by commit
d389a4a81155 ("mm: Add folio flag manipulation functions")
interacting with commit
eac96c3efdb5 ("mm: filemap: check if THP has hwpoisoned subpage for PMD page fault")
from Linus' tree.
I have applied the following merge fix patch taken from Andrew's patch
series.
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios
fix
mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault.patch
for folio tree PAGEFLAG_FALSE() change.
Cc: Yang Shi <shy828301@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/page-flags.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/include/linux/page-flags.h~mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios
+++ a/include/linux/page-flags.h
@@ -803,8 +803,8 @@ PAGEFLAG_FALSE(DoubleMap, double_map)
PAGEFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)
TESTSCFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)
#else
-PAGEFLAG_FALSE(HasHWPoisoned)
- TESTSCFLAG_FALSE(HasHWPoisoned)
+PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)
+ TESTSCFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)
#endif
/*
_
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-11-01 6:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 6:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-02 8:04 linux-next: build failure after merge of the folio tree Stephen Rothwell
2022-05-02 10:01 ` Gao Xiang
2022-03-15 10:26 Stephen Rothwell
2022-03-15 14:42 ` Matthew Wilcox
2022-02-28 12:53 Stephen Rothwell
2022-02-17 7:20 Stephen Rothwell
2022-02-15 6:44 Stephen Rothwell
2022-02-07 4:06 Stephen Rothwell
2022-02-09 3:38 ` Stephen Rothwell
2022-02-09 3:47 ` Matthew Wilcox
2022-01-04 7:29 Stephen Rothwell
2021-09-21 4:26 Stephen Rothwell
2021-09-22 4:19 ` Stephen Rothwell
2021-11-01 22:05 ` Stephen Rothwell
2021-11-02 7:02 ` David Howells
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=20211101174846.2b1097d7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shy828301@gmail.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).