From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Straube <straube.linux@gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the kspp-gustavo tree
Date: Thu, 17 Feb 2022 07:33:28 +0100 [thread overview]
Message-ID: <Yg3sOIChxwSuI8aU@kroah.com> (raw)
In-Reply-To: <20220217141603.7a0ef4ed@canb.auug.org.au>
On Thu, Feb 17, 2022 at 02:16:03PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/r8188eu/include/ieee80211.h
>
> between commit:
>
> fbe9ccfe809d ("treewide: Replace zero-length arrays with flexible-array members")
>
> from the kspp-gustavo tree and commit:
>
> 6c36bcbfcef7 ("staging: r8188eu: remove unused structs from ieee80211.h")
>
> from the staging tree.
>
> I fixed it up (the latter removed the structs updated by the former) 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.
The merge sounds correct, thanks.
greg k-h
next prev parent reply other threads:[~2022-02-17 6:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 3:16 linux-next: manual merge of the staging tree with the kspp-gustavo tree Stephen Rothwell
2022-02-17 6:33 ` Greg KH [this message]
2022-02-17 13:05 ` 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=Yg3sOIChxwSuI8aU@kroah.com \
--to=greg@kroah.com \
--cc=gustavo@embeddedor.com \
--cc=gustavoars@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=straube.linux@gmail.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 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).