From: Huacai Chen <chenhuacai@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Huacai Chen <chenhuacai@loongson.cn>,
Arnd Bergmann <arnd@arndb.de>,
loongarch@lists.linux.dev,
linux-arch <linux-arch@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>, Guo Ren <guoren@kernel.org>,
Xuerui Wang <kernel@xen0n.name>,
Jiaxun Yang <jiaxun.yang@flygoat.com>
Subject: Re: [GIT PULL] LoongArch changes for v5.20
Date: Sat, 13 Aug 2022 10:58:07 +0800 [thread overview]
Message-ID: <CAAhV-H5k-9L1tM4yu4uoNAEB=cadWw3x4OqnJ1eVbncAkMDjfw@mail.gmail.com> (raw)
In-Reply-To: <CAHk-=wgopYkkZxSTCZGP783868VjoyGALMRst_nceA3aH-TW6Q@mail.gmail.com>
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
>
next prev parent reply other threads:[~2022-08-13 2:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 7:24 [GIT PULL] LoongArch changes for v5.20 Huacai Chen
2022-08-12 16:46 ` Linus Torvalds
2022-08-13 2:58 ` Huacai Chen [this message]
2022-08-12 16:59 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAAhV-H5k-9L1tM4yu4uoNAEB=cadWw3x4OqnJ1eVbncAkMDjfw@mail.gmail.com' \
--to=chenhuacai@kernel.org \
--cc=arnd@arndb.de \
--cc=chenhuacai@loongson.cn \
--cc=guoren@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=kernel@xen0n.name \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loongarch@lists.linux.dev \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).