From: "Gustavo A. R. Silva" <gustavo@embeddedor•com>
To: Kalle Valo <kvalo@codeaurora•org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Wireless <linux-wireless@vger•kernel.org>,
"Gustavo A. R. Silva" <gustavoars@kernel•org>,
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 wireless-drivers-next tree with the kspp-gustavo tree
Date: Fri, 21 Aug 2020 01:58:56 -0500 [thread overview]
Message-ID: <f46c70e8-2eeb-ad70-7a19-e941a3d2dfd8@embeddedor.com> (raw)
In-Reply-To: <87364jjgmg.fsf@codeaurora.org>
Hi Kalle,
On 8/19/20 01:26, Kalle Valo wrote:
> Stephen Rothwell <sfr@canb•auug.org.au> writes:
>
>> Today's linux-next merge of the wireless-drivers-next tree got a
>> conflict in:
>>
>> drivers/net/wireless/ath/ath11k/dp_rx.c
>>
>> between commit:
>>
>> 58e813cceabd ("treewide: Use fallthrough pseudo-keyword")
>>
>> from the kspp-gustavo tree and commit:
>>
>> 0b294aebb6a0 ("ath11k: Use fallthrough pseudo-keyword")
>>
>> from the wireless-drivers-next tree.
>>
>> I fixed it up (the latter removed an extra blank line) and can carry the
>> fix as necessary. This is now fixed as far as linux-next is concerned,
>> but any non trivial conflicts should be mentioned to your upstream
>> maintainer when your tree is submitted for merging. You may also want
>> to consider cooperating with the maintainer of the conflicting tree to
>> minimise any particularly complex conflicts.
>
> Gustavo, why do you have patches changing ath11k in your tree? PLEASE
> don't do that! Instead properly send them to linux-wireless and ath11k
> lists, as you have done before. That way there are no unncessary
> conflicts like this one which cause extra work for the maintainers.
>
Sure thing. Sorry about that. I just sent out some patches to address the
vast majority of the remaining fall-through conversions to make in
drivers/net/wireless/
Thanks
--
Gustavo
prev parent reply other threads:[~2020-08-21 7:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-19 1:18 linux-next: manual merge of the wireless-drivers-next tree with the kspp-gustavo tree Stephen Rothwell
2020-08-19 6:26 ` Kalle Valo
2020-08-21 6:58 ` Gustavo A. R. Silva [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=f46c70e8-2eeb-ad70-7a19-e941a3d2dfd8@embeddedor.com \
--to=gustavo@embeddedor$(echo .)com \
--cc=gustavoars@kernel$(echo .)org \
--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 \
/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