Subject: Re: linux-next: manual merge of the random tree with the mm-stable tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 24 Jul 2024 09:16:59 +1000

Hi all,

On Tue, 9 Jul 2024 17:43:40 +1000 Stephen Rothwell <[email-masked]> wrote:
> 
> Today's linux-next merge of the random tree got a conflict in:
> 
>   tools/testing/selftests/mm/Makefile
> 
> between commit:
> 
>   3a103b5315b7 ("selftest: mm: Test if hugepage does not get leaked during __bio_release_pages()")
> 
> from the mm-stable tree and commit:
> 
>   94beef29e110 ("mm: add MAP_DROPPABLE for designating always lazily freeable mappings")
> 
> from the random 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.
> 
> diff --cc tools/testing/selftests/mm/Makefile
> index e1aa09ddaa3d,e3e5740e13e1..000000000000
> --- a/tools/testing/selftests/mm/Makefile
> +++ b/tools/testing/selftests/mm/Makefile
> @@@ -75,7 -73,7 +75,8 @@@ TEST_GEN_FILES += ksm_functional_test
>   TEST_GEN_FILES += mdwe_test
>   TEST_GEN_FILES += hugetlb_fault_after_madv
>   TEST_GEN_FILES += hugetlb_madv_vs_map
>  +TEST_GEN_FILES += hugetlb_dio
> + TEST_GEN_FILES += droppable
>   
>   ifneq ($(ARCH),arm64)
>   TEST_GEN_FILES += soft-dirty

This is now a conflict between the random tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell