Re: linux-next: manual merge of the compiler-attributes tree with the kbuild tree

From: Stephen Rothwell
Date: Mon Oct 29 2018 - 19:49:58 EST

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 ...

Stephen Rothwell

Attachment: pgpwG7NFpSYvH.pgp
Description: OpenPGP digital signature