linux-kernel - Re: linux-next: manual merge of the rust tree with the kbuild 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: <CANiq72k1uL3MdebRtck-EODx2YnucOAb-7hb1zzWy-L7UAwxcQ@mail.gmail.com>
Date:   Thu, 18 Mar 2021 06:04:44 +0100
From:   Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Masahiro Yamada <masahiroy@...nel.org>,
        Adam Bratschi-Kaye <ark.email@...il.com>,
        Alex Gaynor <alex.gaynor@...il.com>,
        Finn Behrens <me@...enk.de>,
        Geoffrey Thomas <geofft@...reload.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Miguel Ojeda <ojeda@...nel.org>,
        Nathan Chancellor <nathan@...nel.org>,
        Wedson Almeida Filho <wedsonaf@...gle.com>,
        Nick Desaulniers <ndesaulniers@...gle.com>
Subject: Re: linux-next: manual merge of the rust tree with the kbuild tree

On Thu, Mar 18, 2021 at 5:37 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> I fixed it up (see below - I think I got this right ...) 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.

Yeah, the TENTATIVE_CLANG_FLAGS is the workaround to support GCC I
mentioned privately. It is unfortunate that particular bit was the one
that had to give you a conflict... :-)

Longer-term, Masahiro et. al. may have better ideas on how to do the
whole trick in a cleaner way (kbuild folks: don't worry, our branch is
not going to be merged just yet ;-)

Cheers,
Miguel