[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wgopYkkZxSTCZGP783868VjoyGALMRst_nceA3aH-TW6Q@mail.gmail.com>
Date: Fri, 12 Aug 2022 09:46:54 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Huacai Chen <chenhuacai@...ngson.cn>
Cc: Arnd Bergmann <arnd@...db.de>, Huacai Chen <chenhuacai@...nel.org>,
loongarch@...ts.linux.dev, linux-arch@...r.kernel.org,
linux-kernel@...r.kernel.org, Guo Ren <guoren@...nel.org>,
Xuerui Wang <kernel@...0n.name>,
Jiaxun Yang <jiaxun.yang@...goat.com>
Subject: Re: [GIT PULL] LoongArch changes for v5.20
On Fri, Aug 12, 2022 at 12:24 AM Huacai Chen <chenhuacai@...ngson.cn> wrote:
>
> Note: There is a conflict in arch/loongarch/include/asm/irq.h but can
> be fixed simply (just remove both lines from the irqchip tree and the
> loongarch tree).
Hmm. I don't see any conflict, so I assume there is something else in
linux-next that I haven't yet gotten.
Linus
Powered by blists - more mailing lists