From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vinod Koul <vkoul@kernel.org>,
Wireless <linux-wireless@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
Ajay Singh <ajay.kathat@microchip.com>,
Vladimir Oltean <vladimir.oltean@nxp.com>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees
Date: Fri, 17 Jul 2020 15:05:34 +0300 [thread overview]
Message-ID: <87tuy673e9.fsf@codeaurora.org> (raw)
In-Reply-To: <20200717165336.312dcf09@canb.auug.org.au> (Stephen Rothwell's message of "Fri, 17 Jul 2020 16:53:36 +1000")
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.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2020-07-17 12:05 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 [this message]
2020-07-20 8:33 ` Nicolas.Ferre
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=87tuy673e9.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=ajay.kathat@microchip.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=sfr@canb.auug.org.au \
--cc=vkoul@kernel.org \
--cc=vladimir.oltean@nxp.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.