* linux-next: manual merge of the staging tree with the kspp-gustavo tree
@ 2022-02-17 3:16 Stephen Rothwell
2022-02-17 6:33 ` Greg KH
2022-02-17 13:05 ` Gustavo A. R. Silva
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2022-02-17 3:16 UTC (permalink / raw)
To: Greg KH, Gustavo A. R. Silva
Cc: Greg Kroah-Hartman, Gustavo A. R. Silva,
Linux Kernel Mailing List, Linux Next Mailing List,
Michael Straube
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the staging tree with the kspp-gustavo tree
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
2022-02-17 13:05 ` Gustavo A. R. Silva
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2022-02-17 6:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Gustavo A. R. Silva, Gustavo A. R. Silva,
Linux Kernel Mailing List, Linux Next Mailing List,
Michael Straube
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the staging tree with the kspp-gustavo tree
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
@ 2022-02-17 13:05 ` Gustavo A. R. Silva
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2022-02-17 13:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Gustavo A. R. Silva, Greg Kroah-Hartman,
Linux Kernel Mailing List, Linux Next Mailing List,
Michael Straube
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.
I just fixed this up in my -next tree.
Thanks for the report, Stephen.
--
Gustavo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-17 12:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2022-02-17 13:05 ` Gustavo A. R. Silva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox