linux-kernel - Re: linux-next: manual merge of the staging tree with the kspp-gustavo tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20220217130537.GA930267@embeddedor>
Date:   Thu, 17 Feb 2022 07:05:37 -0600
From:   "Gustavo A. R. Silva" <gustavoars@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Greg KH <greg@...ah.com>,
        "Gustavo A. R. Silva" <gustavo@...eddedor.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michael Straube <straube.linux@...il.com>
Subject: Re: linux-next: manual merge of the staging tree with the
 kspp-gustavo tree

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