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;
MIME-Version: 1.0
References: <mhng-57198db1-de34-4dca-be9f-989b1137503e@palmer-ri-x1c9>
In-Reply-To: <mhng-57198db1-de34-4dca-be9f-989b1137503e@palmer-ri-x1c9>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri, 28 Apr 2023 17:08:53 -0700
Message-ID: <CAHk-=wivud6jefN+UKa4zkAf4dkapyh4iRazyUVgXTzqRntOMg@mail.gmail.com>
Subject: Re: [GIT PULL] RISC-V Patches for the 6.4 Merge Window, Part 1
To:     Palmer Dabbelt <palmer@rivosinc.com>
Cc:     linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Apr 28, 2023 at 9:09=E2=80=AFAM Palmer Dabbelt <palmer@rivosinc.com=
> wrote:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/risc=
v-for-linus-6.4-mw1

Ugh, so this conflicted pretty nastily in arch/riscv/mm/init.c between comm=
its

  ef69d2559fe9 ("riscv: Move early dtb mapping into the fixmap region")
  8589e346bbb6 ("riscv: Move the linear mapping creation in its own functio=
n")

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.

                  Linus