From: <Nicolas.Ferre@microchip•com>
To: <kvalo@codeaurora•org>, <sfr@canb•auug.org.au>
Cc: <vkoul@kernel•org>, <linux-wireless@vger•kernel.org>,
<linux-next@vger•kernel.org>, <linux-kernel@vger•kernel.org>,
<Ludovic.Desroches@microchip•com>, <Ajay.Kathat@microchip•com>,
<vladimir.oltean@nxp•com>, <davem@davemloft•net>,
<alexandre.belloni@bootlin•com>
Subject: Re: linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees
Date: Mon, 20 Jul 2020 08:33:12 +0000 [thread overview]
Message-ID: <5bc97453-15fa-b855-0d5a-886fcfb5e0df@microchip.com> (raw)
In-Reply-To: <87tuy673e9.fsf@codeaurora.org>
On 17/07/2020 at 14:05, Kalle Valo wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Stephen Rothwell <sfr@canb•auug.org.au> writes:
>
>> Today's linux-next merge of the dmaengine tree got a conflict in:
>>
>> MAINTAINERS
>>
>> between commit:
>>
>> 5625f965d764 ("wilc1000: move wilc driver out of staging")
>>
>> from the wireless-drivers-next tree, commit:
>>
>> 6e701c299469 ("MAINTAINERS: merge entries for felix and ocelot drivers")
>>
>> from Linus' tree and commit:
>>
>> c3846c4cce15 ("MAINTAINERS: dmaengine: Microchip: add Tudor Ambarus
>> as co-maintainer")
>>
>> from the dmaengine tree.
>
> I think this is trivial enough that Linus can take care of it without
> any extra actions. Thanks for the report.
From my perspective your resolution Stephen is good.
Thanks to both of you for the heads-up.
Best regards,
Nicolas
> --
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
>
--
Nicolas Ferre
prev parent reply other threads:[~2020-07-20 8:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 6:53 linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees Stephen Rothwell
2020-07-17 12:05 ` Kalle Valo
2020-07-20 8:33 ` Nicolas.Ferre [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=5bc97453-15fa-b855-0d5a-886fcfb5e0df@microchip.com \
--to=nicolas.ferre@microchip$(echo .)com \
--cc=Ajay.Kathat@microchip$(echo .)com \
--cc=Ludovic.Desroches@microchip$(echo .)com \
--cc=alexandre.belloni@bootlin$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=kvalo@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=vkoul@kernel$(echo .)org \
--cc=vladimir.oltean@nxp$(echo .)com \
/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