On Tue, Dec 17, 2024 at 08:40:37AM +0800, Inochi Amaoto wrote: > On Tue, Dec 17, 2024 at 12:00:23AM +0800, Yangyu Chen wrote: > > Possible conflict with: https://lore.kernel.org/linux-riscv/20241111-v5_user_cfi_series-v8-22-dce14aa30207@xxxxxxxxxxxx/ > > > > Yeah, I know the conflict. As the time of merging these patch is > uncertain, what I can do now is to match the upstream code. The solution is to not worry about it. Palmer can resolve trivial numerical conflicts like this.
Attachment:
signature.asc
Description: PGP signature
