From: Will Deacon <will@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Catalin Marinas <catalin.marinas@arm•com>,
Anshuman Khandual <anshuman.khandual@arm•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mike Kravetz <mike.kravetz@oracle•com>
Subject: Re: linux-next: manual merge of the arm64 tree with the arm64-fixes tree
Date: Thu, 7 Oct 2021 08:42:36 +0100 [thread overview]
Message-ID: <20211007074236.GA31441@willie-the-truck> (raw)
In-Reply-To: <20211007094221.1c9ce01f@canb.auug.org.au>
On Thu, Oct 07, 2021 at 09:42:21AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/mm/hugetlbpage.c
>
> between commit:
>
> 0350419b14b9 ("arm64/hugetlb: fix CMA gigantic page order for non-4K PAGE_SIZE")
>
> from the arm64-fixes tree and commit:
>
> f8b46c4b51ab ("arm64/mm: Add pud_sect_supported()")
>
> from the arm64 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/arm64/mm/hugetlbpage.c
> index a8158c948966,029cf5e42c4c..000000000000
> --- a/arch/arm64/mm/hugetlbpage.c
> +++ b/arch/arm64/mm/hugetlbpage.c
> @@@ -40,11 -40,10 +40,10 @@@ void __init arm64_hugetlb_cma_reserve(v
> {
> int order;
>
> - #ifdef CONFIG_ARM64_4K_PAGES
> - order = PUD_SHIFT - PAGE_SHIFT;
> - #else
> - order = CONT_PMD_SHIFT - PAGE_SHIFT;
> - #endif
> + if (pud_sect_supported())
> + order = PUD_SHIFT - PAGE_SHIFT;
> + else
> - order = CONT_PMD_SHIFT + PMD_SHIFT - PAGE_SHIFT;
> ++ order = CONT_PMD_SHIFT - PAGE_SHIFT;
Thanks, Stephen. I think I'll merge our fixes branch into the core branch
and resolve this there.
Will
next prev parent reply other threads:[~2021-10-07 7:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 22:42 linux-next: manual merge of the arm64 tree with the arm64-fixes tree Stephen Rothwell
2021-10-07 7:42 ` Will Deacon [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-29 23:35 Stephen Rothwell
2022-07-20 23:45 Stephen Rothwell
2022-07-21 10:45 ` Stephen Rothwell
2022-07-21 16:14 ` Will Deacon
2020-11-30 23:05 Stephen Rothwell
2020-12-01 8:37 ` Catalin Marinas
2019-06-26 23:35 Stephen Rothwell
2019-06-06 22:38 Stephen Rothwell
2018-03-27 23:19 Stephen Rothwell
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=20211007074236.GA31441@willie-the-truck \
--to=will@kernel$(echo .)org \
--cc=anshuman.khandual@arm$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mike.kravetz@oracle$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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