Messages in this thread | | | From | Huacai Chen <> | Date | Sat, 13 Aug 2022 10:58:07 +0800 | Subject | Re: [GIT PULL] LoongArch changes for v5.20 |
| |
Hi, Linus,
On Sat, Aug 13, 2022 at 12:47 AM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Fri, Aug 12, 2022 at 12:24 AM Huacai Chen <chenhuacai@loongson.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. Yes, the conflict will happen when merge the irqchip-fixes tree.
Huacai > > Linus >
| |