Re: [PATCH] RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename

[Conor Dooley]

On 1 May 2023 23:52:58 IST, Palmer Dabbelt <palmer at dabbelt.com> wrote:
>On Sat, 29 Apr 2023 02:32:33 PDT (-0700), Conor Dooley wrote:
>> On Sat, Apr 29, 2023 at 10:27:33AM +0100, Conor Dooley wrote:
>>> From: Conor Dooley <conor.dooley at microchip.com>
>>> 
>>> Lukas warned that ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP had been
>>> renamed in the mm tree & that RISC-V would need a fixup as part of the
>>> merge. The warning was missed however, and RISC-V is selecting the
>>> orphaned Kconfig option.
>>> 
>>> Fixes: 89d77f71f493 ("Merge tag 'riscv-for-linus-6.4-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux")
>>> Reported-by: Lukas Bulwhan <lukas.bulwhan at gmail.com>
>> 
>> That should have been Lukas Bulwahn <lukas.bulwahn at gmail.com>.
>
>I think I got that right, but the email bounced.  I'm not sure if it's just the list issues, though.

B4 probably just replied to the address in my original email,
rather than the corrected one?

>
>> This is what I get for hand-typing an email address that I could have
>> copied from lore I suppose.
>> 
>>> Link: https://lore.kernel.org/linux-riscv/CAKXUXMyVeg2kQK_edKHtMD3eADrDK_PKhCSVkMrLDdYgTQQ5rg@mail.gmail.com/
>>> Signed-off-by: Conor Dooley <conor.dooley at microchip.com>
>>> ---
>>> I guess you picking this up for your second PR makes the most sense
>>> Palmer?
>>> 
>>> CC: Palmer Dabbelt <palmer at dabbelt.com>
>>> CC: Linus Torvalds <torvalds at linux-foundation.org>
>>> CC: Andrew Morton <akpm at linux-foundation.org>
>>> CC: Aneesh Kumar K.V <aneesh.kumar at linux.ibm.com>
>>> CC: Lukas Bulwhan <lukas.bulwhan at gmail.com>
>>> CC: linux-riscv at lists.infradead.org
>>> CC: linux-kernel at vger.kernel.org
>>> ---
>>>  arch/riscv/Kconfig | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>> 
>>> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
>>> index 5c88ac4b52be..e1bdb3fb16cc 100644
>>> --- a/arch/riscv/Kconfig
>>> +++ b/arch/riscv/Kconfig
>>> @@ -46,9 +46,9 @@ config RISCV
>>>  	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
>>>  	select ARCH_WANT_FRAME_POINTERS
>>>  	select ARCH_WANT_GENERAL_HUGETLB if !RISCV_ISA_SVNAPOT
>>> -	select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP
>>>  	select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
>>>  	select ARCH_WANT_LD_ORPHAN_WARN if !XIP_KERNEL
>>> +	select ARCH_WANT_OPTIMIZE_VMEMMAP
>>>  	select ARCH_WANTS_THP_SWAP if HAVE_ARCH_TRANSPARENT_HUGEPAGE
>>>  	select BINFMT_FLAT_NO_DATA_START_OFFSET if !MMU
>>>  	select BUILDTIME_TABLE_SORT if MMU
>>> -- 
>>> 2.39.2
>>>