Hi all,
On Tue, 30 Oct 2018 10:46:37 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
Attachment:
pgpTJTXc_75Zf.pgp
Description: OpenPGP digital signature
