linux-kernel - linux-next: manual merge of the modules tree with the compiler-attributes 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-next>] [day] [month] [year] [list]

Message-ID: <20190915222720.GL4352@sirena.co.uk>
Date:   Sun, 15 Sep 2019 23:27:20 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Jessica Yu <jeyu@...nel.org>,
        Matthias Maennich <maennich@...gle.com>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Arnd Bergmann <arnd@...db.de>,
        Martijn Coenen <maco@...roid.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the modules tree with the
 compiler-attributes tree

Hi all,

Today's linux-next merge of the modules tree got a conflict in:

  include/linux/export.h

between at least commit:

  69a94abb82eed ("export.h, genksyms: do not make genksyms calculate CRC of trimmed symbols")

from the compiler-attributes tree and commit:

  cb9b55d21fe06 ("module: add support for symbol namespaces.")

from the modules tree.

Since this conflcit is non-trivial, it's late and there's a good chance
I'm not going to actually finish building -next today I've just used the
commit from the last time -next was built, 3b5be16c7e90a69c, for the
modules tree - sorry.  I'll have another go tomorrow.  This means none
of the changes in modules-next are in -next as they were all committed
in the past week.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)