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

[Palmer Dabbelt]

On Sat, 29 Apr 2023 14:48:18 PDT (-0700), konstantin.ryabitsev at linux.dev wrote:
>> April 29, 2023 4:17 PM, "Palmer Dabbelt" <palmer at dabbelt.com> wrote:
>>>> I guess you picking this up for your second PR makes the most sense
>>>> Palmer?
>> 
>> Yep, except it crashes b4
>> 
>> $ b4 shazam -lts https://lore.kernel.org/all/20230429-trilogy-jolly-12bf5c53d62d@spud
>> Grabbing thread from lore.kernel.org/all/20230429-trilogy-jolly-12bf5c53d62d%40spud/t.mbox.gz
>> Analyzing 2 messages in the thread
>> Checking attestation on all messages, may take a moment...
>> Traceback (most recent call last):
>> File "/home/palmer/.local/src/b4/b4/command.py", line 383, in <module>
>> cmd()
>> File "/home/palmer/.local/src/b4/b4/command.py", line 366, in cmd
>> cmdargs.func(cmdargs)
>> File "/home/palmer/.local/src/b4/b4/command.py", line 100, in cmd_shazam
>> b4.mbox.main(cmdargs)
>> File "/home/palmer/.local/src/b4/b4/mbox.py", line 713, in main
>> make_am(msgs, cmdargs, msgid)
>> File "/home/palmer/.local/src/b4/b4/mbox.py", line 101, in make_am
>> am_msgs = lser.get_am_ready(noaddtrailers=cmdargs.noaddtrailers,
>> File "/home/palmer/.local/src/b4/b4/__init__.py", line 552, in get_am_ready
>> checkmark, trailers, attcrit = lmsg.get_attestation_trailers(attpolicy, maxdays)
>> File "/home/palmer/.local/src/b4/b4/__init__.py", line 1319, in get_attestation_trailers
>> for attestor in self.attestors:
>> File "/home/palmer/.local/src/b4/b4/__init__.py", line 1158, in attestors
>> self._load_patatt_attestors()
>> File "/home/palmer/.local/src/b4/b4/__init__.py", line 1261, in _load_patatt_attestors
>> patatt_config = patatt.get_config_from_git(r'patatt\..*', multivals=['keyringsrc'])
>> AttributeError: module 'patatt' has no attribute 'get_config_from_git'
>> 
>> So I probably need to just go update my setup, I've got a bunch of wacky stuff.
>> I'll try and remember to do so, but I'm going to scrub through other bits
>> first...
>
> Indeed, you have a newer version of b4 without also updating the 
> patatt dependency. If you're using b4 from git, you need to "git 
> submodule update".

Thanks, it's fixed.  This one's in the queue for testing, but it looks 
generally fine.  Might be a bit slower than usual, as I'm also running 
the glibc tests.