From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail•com>,
Masahiro Yamada <yamada.masahiro@socionext•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Changbin Du <changbin.du@gmail•com>
Subject: Re: linux-next: manual merge of the compiler-attributes tree with the kbuild tree
Date: Tue, 30 Oct 2018 10:49:41 +1100 [thread overview]
Message-ID: <20181030104941.4fef7dad@canb.auug.org.au> (raw)
In-Reply-To: <20181030104637.382c26d0@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
Hi all,
On Tue, 30 Oct 2018 10:46:37 +1100 Stephen Rothwell <sfr@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-10-29 23:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-29 23:46 linux-next: manual merge of the compiler-attributes tree with the kbuild tree Stephen Rothwell
2018-10-29 23:49 ` Stephen Rothwell [this message]
2018-10-30 11:21 ` Miguel Ojeda
2018-10-30 15:04 ` Changbin Du
2018-10-30 15:53 ` Masahiro Yamada
2018-10-30 16:02 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181030104941.4fef7dad@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=changbin.du@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miguel.ojeda.sandonis@gmail$(echo .)com \
--cc=yamada.masahiro@socionext$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox