Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
MIME-Version: 1.0
References: <mhng-3cfe92b5-a83a-4642-9b9e-8416ae717fd6@palmer-ri-x1c9>
In-Reply-To: <mhng-3cfe92b5-a83a-4642-9b9e-8416ae717fd6@palmer-ri-x1c9>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue, 31 May 2022 14:52:16 -0700
Message-ID: <CAHk-=whMTEAuBRAS7aonfVM9wgupOok4HO6gX9X0FBzE3Uv2sA@mail.gmail.com>
Subject: Re: [GIT PULL] RISC-V Patches for the 5.19 Merge Window, Part 1
To:     Palmer Dabbelt <palmer@rivosinc.com>
Cc:     linux-riscv <linux-riscv@lists.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, May 31, 2022 at 10:13 AM Palmer Dabbelt <palmer@rivosinc.com> wrote:
>
> I have a single manual resolution in the fe510 device tree, just the result of
> some conflicting fixes.  It's not showing up in my merge, but a bunch of other
> automatic resolutions are which is a bit worrisome on my end -- I don't usually
> touch other trees, but we had a handful of big cross-tree things this time.

Gaah. I'd have normally preferred for things like this to go through
Arnd, but it looks like he at least ack'ed these things..

I've obviously pulled it, as you can see from the pr-tracker-bot reply
that already went out.

               Linus