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

Date:   Tue, 30 Oct 2018 10:49:41 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miguel Ojeda <miguel.ojeda.sandonis@...il.com>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Changbin Du <changbin.du@...il.com>
Subject: Re: linux-next: manual merge of the compiler-attributes tree with
 the kbuild tree

Hi all,

On Tue, 30 Oct 2018 10:46:37 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the compiler-attributes tree got a conflict
> in:
> 
>   include/linux/compiler-gcc.h
> 
> between commit:
> 
>   94c7dfd01652 ("kernel hacking: support building kernel with -Og optimization level")
> 
> from the kbuild tree and commits:
> 
>   5c67a52f3da0 ("Compiler Attributes: always use the extra-underscores syntax")
>   989bd5000f36 ("Compiler Attributes: remove unneeded sparse (__CHECKER__) tests")
> 
> from the compiler-attributes tree.
> 
> I fixed it up (the latter just removed the __CHECKER__ check, so I did
> that) and can carry the fix as necessary. This is now fixed as far as

On reflection, that may not have been the correct resolution ...

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped