# git rev-parse -q --verify e66435936756d9bce96433be183358a8994a0f0d^{commit} e66435936756d9bce96433be183358a8994a0f0d already have revision, skipping fetch # git checkout -q -f -B kisskb e66435936756d9bce96433be183358a8994a0f0d # git clean -qxdf # < git log -1 # commit e66435936756d9bce96433be183358a8994a0f0d # Author: Linus Torvalds # Date: Mon Nov 1 14:56:37 2021 -0700 # # mm: fix mismerge of folio page flag manipulators # # I had missed a semantic conflict between commit d389a4a81155 ("mm: Add # folio flag manipulation functions") from the folio tree, and commit # eac96c3efdb5 ("mm: filemap: check if THP has hwpoisoned subpage for PMD # page fault") that added a new set of page flags. # # My build tests had too many options enabled, which hid this issue. But # if you didn't have MEMORY_FAILURE or TRANSPARENT_HUGEPAGE enabled, you'd # end up with build errors like this: # # include/linux/page-flags.h:806:29: error: macro "PAGEFLAG_FALSE" requires 2 arguments, but only 1 given # 806 | PAGEFLAG_FALSE(HasHWPoisoned) # | ^ # # due to the missing lowercase name used for folio function naming. # # Fixes: 49f8275c7d92 ("Merge tag 'folio-5.16' of git://git.infradead.org/users/willy/pagecache") # Reported-by: Naresh Kamboju # Reported-by: Yang Shi # Cc: Matthew Wilcox # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 e66435936756d9bce96433be183358a8994a0f0d # < make -s -j 24 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux- randconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_BPF_PRELOAD=n # Added to kconfig # < make -s -j 24 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux- help # make -s -j 24 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux- olddefconfig .config:5444:warning: override: reassigning to symbol STANDALONE .config:5445:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD .config:5450:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY # make -s -j 24 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux- Completed OK # rm -rf /kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc11 # Build took: 0:08:04.502213