From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Catalin Marinas <catalin.marinas@arm.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: linux-next: manual merge of the tip tree with the arm64 tree
Date: Mon, 4 Sep 2017 15:29:03 +1000 [thread overview]
Message-ID: <20170904152903.09fc4876@canb.auug.org.au> (raw)
In-Reply-To: <20170822133802.4c291ed8@canb.auug.org.au>
Hi all,
On Tue, 22 Aug 2017 13:38:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/firmware/efi/libstub/arm64-stub.c
>
> between commit:
>
> 170976bcab07 ("efi/arm64: add EFI_KIMG_ALIGN")
>
> from the arm64 tree and commit:
>
> 0426a4e68f18 ("efi/libstub/arm64: Force 'hidden' visibility for section markers")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/firmware/efi/libstub/arm64-stub.c
> index af6ae95a5e34,f7a6970e9abc..000000000000
> --- a/drivers/firmware/efi/libstub/arm64-stub.c
> +++ b/drivers/firmware/efi/libstub/arm64-stub.c
> @@@ -9,10 -9,17 +9,18 @@@
> * published by the Free Software Foundation.
> *
> */
> +
> + /*
> + * To prevent the compiler from emitting GOT-indirected (and thus absolute)
> + * references to the section markers, override their visibility as 'hidden'
> + */
> + #pragma GCC visibility push(hidden)
> + #include <asm/sections.h>
> + #pragma GCC visibility pop
> +
> #include <linux/efi.h>
> #include <asm/efi.h>
> +#include <asm/memory.h>
> - #include <asm/sections.h>
> #include <asm/sysreg.h>
>
> #include "efistub.h"
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-09-04 5:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-22 3:38 linux-next: manual merge of the tip tree with the arm64 tree Stephen Rothwell
2017-09-04 5:29 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-13 16:45 broonie
2021-12-13 16:45 ` broonie
2021-08-27 4:09 Stephen Rothwell
2020-05-22 6:11 Stephen Rothwell
2020-03-18 4:27 Stephen Rothwell
2020-03-18 8:50 ` Catalin Marinas
2020-03-10 1:49 Stephen Rothwell
2019-04-15 4:25 Stephen Rothwell
2019-04-15 4:21 Stephen Rothwell
2017-11-01 5:47 Stephen Rothwell
2017-11-13 22:52 ` Stephen Rothwell
2017-06-16 3:25 Stephen Rothwell
2017-07-03 1:29 ` Stephen Rothwell
2017-03-31 3:02 Stephen Rothwell
2017-03-31 9:32 ` Arnd Bergmann
2017-03-31 11:24 ` Stephen Rothwell
2016-09-12 2:54 Stephen Rothwell
2016-05-12 2:00 Stephen Rothwell
2016-04-29 3:56 Stephen Rothwell
2016-04-29 9:04 ` Matt Fleming
2016-02-26 1:53 Stephen Rothwell
2016-02-26 1:53 Stephen Rothwell
2015-10-22 2:26 Stephen Rothwell
2015-10-22 12:06 ` Suzuki K. Poulose
2015-10-22 15:32 ` Catalin Marinas
2015-10-31 22:17 ` Stephen Rothwell
2015-10-15 3:05 Stephen Rothwell
2015-10-13 2:10 Stephen Rothwell
2015-10-13 9:50 ` Will Deacon
2014-05-23 6:44 Stephen Rothwell
2014-05-23 9:23 ` Catalin Marinas
2014-05-23 6:28 Stephen Rothwell
2014-05-23 8:41 ` Catalin Marinas
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=20170904152903.09fc4876@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.