Re: [GIT PULL] LoongArch changes for v5.20

[Huacai Chen]

Hi, Linus,

On Sat, Aug 13, 2022 at 12:47 AM Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Fri, Aug 12, 2022 at 12:24 AM Huacai Chen <chenhuacai@xxxxxxxxxxx> 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.
Yes, the conflict will happen when merge the irqchip-fixes tree.

Huacai
>
>              Linus
>