lkml.org 
[lkml]   [2017]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tip tree with the arm64 tree
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

\
 
 \ /
  Last update: 2017-09-04 07:29    [W:0.033 / U:1.496 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site