From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kees Cook <keescook@chromium.org>,
Wireless <linux-wireless@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Luca Coelho <luciano.coelho@intel.com>,
Miri Korenblit <miriam.rachel.korenblit@intel.com>,
Jakub Kicinski <kuba@kernel.org>,
David Miller <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the kspp tree with the wireless-drivers-next tree
Date: Thu, 28 Oct 2021 11:40:42 +0300 [thread overview]
Message-ID: <87ilxh5yph.fsf@codeaurora.org> (raw)
In-Reply-To: <20211028192934.01520d7e@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 28 Oct 2021 19:29:34 +1100")
(adding Jakub and Dave so that they are aware of this)
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
>
> between commit:
>
> dc52fac37c87 ("iwlwifi: mvm: Support new TX_RSP and COMPRESSED_BA_RES versions")
>
> from the wireless-drivers-next tree and commit:
>
> fa7845cfd53f ("treewide: Replace open-coded flex arrays in unions")
>
> from the kspp tree.
>
> I fixed it up (see below) 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.
I don't know what kspp tree is and either I don't know why they didn't
submit the patch to wireless-drivers-next, so I assume they will handle
the conflict as well. But I really prefer that they would submit patches
to wireless-drivers-next instead to avoid unnecessary conflicts like
this.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2021-10-28 8:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 8:29 linux-next: manual merge of the kspp tree with the wireless-drivers-next tree Stephen Rothwell
2021-10-28 8:40 ` Kalle Valo [this message]
2021-10-28 16:14 ` Kees Cook
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=87ilxh5yph.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=davem@davemloft.net \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=miriam.rachel.korenblit@intel.com \
--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 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.