Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sat, 29 Apr 2023 12:48:39 -0700 (PDT)
Subject:     Re: [GIT PULL] RISC-V Patches for the 6.4 Merge Window, Part 1
In-Reply-To: <CAHk-=wivud6jefN+UKa4zkAf4dkapyh4iRazyUVgXTzqRntOMg@mail.gmail.com>
CC:     linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
From:   Palmer Dabbelt <palmer@rivosinc.com>
To:     Linus Torvalds <torvalds@linux-foundation.org>
Message-ID: <mhng-c9879e1f-4d38-41b9-8082-7c463fbed66c@palmer-ri-x1c9a>
Mime-Version: 1.0 (MHng)
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

On Fri, 28 Apr 2023 17:08:53 PDT (-0700), Linus Torvalds wrote:
> On Fri, Apr 28, 2023 at 9:09 AM Palmer Dabbelt <palmer@rivosinc.com> wrote:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.4-mw1
>
> Ugh, so this conflicted pretty nastily in arch/riscv/mm/init.c between commits
>
>   ef69d2559fe9 ("riscv: Move early dtb mapping into the fixmap region")
>   8589e346bbb6 ("riscv: Move the linear mapping creation in its own function")
>
> and while I did try to make sense of it all, and generated what looks
> like a sane resolution to me, I did *not* do some kind of build check,
> much less can I test anything.
>
> So.. Caveat emptor. I may or may not have gotten that conflict right,
> and you should most definitely double-check it very carefully.

Thanks.  I'm not sure why I didn't see that locally, it'd had shown up 
in linux-next but I'd figured something else was going on.  I'll go take 
a look, the post-merge stuff is testing already on my end and nothing 
has failed yet.