From: Marc Zyngier <marc.zyngier@arm•com>
To: Linus Walleij <linus.walleij@linaro•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the gpio tree with the irqchip tree
Date: Wed, 21 Aug 2019 12:46:57 +0100 [thread overview]
Message-ID: <c6615861-4c1e-783c-bcbe-a96443c216d9@arm.com> (raw)
In-Reply-To: <CACRpkdbAR5JTcEmatQ1F0=fRWm4=1jUqaehA=vFtc8Y5=5V-VA@mail.gmail.com>
On 21/08/2019 12:30, Linus Walleij wrote:
> On Wed, Aug 21, 2019 at 10:13 AM Marc Zyngier <marc.zyngier@arm•com> wrote:
>
>> Linus: do you want to take this patch (daa19fe5b082) through your tree
>> instead in order to avoid the conflict when this hit the other Linus?
>> It shouldn't create any havoc...
>
> Is it completely independent from the rest? Then I will pick it
> so we get less fuzz.
Yup, it should be fine as a standalone patch. Let me know once you've
taken it and I'll drop it from my tree.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
prev parent reply other threads:[~2019-08-21 11:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 6:03 linux-next: manual merge of the gpio tree with the irqchip tree Stephen Rothwell
2019-08-21 8:13 ` Marc Zyngier
2019-08-21 11:30 ` Linus Walleij
2019-08-21 11:46 ` Marc Zyngier [this message]
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=c6615861-4c1e-783c-bcbe-a96443c216d9@arm.com \
--to=marc.zyngier@arm$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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