From: Kalle Valo <kvalo@codeaurora.org>
To: 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: Wed, 19 Aug 2020 09:26:31 +0300 [thread overview]
Message-ID: <87364jjgmg.fsf@codeaurora.org> (raw)
In-Reply-To: <20200819111815.73cae4b0@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 19 Aug 2020 11:18:15 +1000")
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.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2020-08-19 6:26 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 [this message]
2020-08-21 6:58 ` Gustavo A. R. Silva
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=87364jjgmg.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=gustavoars@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).