* linux-next: manual merge of the tip tree with the xtensa tree
@ 2014-01-13 3:26 Stephen Rothwell
2014-01-13 3:38 ` czankel
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2014-01-13 3:26 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Chris Zankel
Cc: linux-next, linux-kernel, Max Filippov
[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/xtensa/include/asm/barrier.h between commit dbacef090841 ("xtensa:
add SMP support") from the xtensa tree and commit 93ea02bb8435 ("arch:
Clean up asm/barrier.h implementations using asm-generic/barrier.h") from
the tip tree.
I fixed it up (I am pretty sure - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/xtensa/include/asm/barrier.h
index 8e5e5c980a7a,e1ee6b51dfc5..000000000000
--- a/arch/xtensa/include/asm/barrier.h
+++ b/arch/xtensa/include/asm/barrier.h
@@@ -16,16 -13,10 +13,6 @@@
#define rmb() barrier()
#define wmb() mb()
--#ifdef CONFIG_SMP
- #define smp_mb() mb()
- #define smp_rmb() rmb()
- #define smp_wmb() wmb()
- #else
- #define smp_mb() barrier()
- #define smp_rmb() barrier()
- #define smp_wmb() barrier()
-#error smp_* not defined
--#endif
--
- #define set_mb(var, value) do { var = value; mb(); } while (0)
+ #include <asm-generic/barrier.h>
#endif /* _XTENSA_SYSTEM_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the tip tree with the xtensa tree
2014-01-13 3:26 linux-next: manual merge of the tip tree with the xtensa tree Stephen Rothwell
@ 2014-01-13 3:38 ` czankel
0 siblings, 0 replies; 6+ messages in thread
From: czankel @ 2014-01-13 3:38 UTC (permalink / raw)
To: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: linux-next, linux-kernel, Max Filippov
Hi Stephen,
Thanks for the fix! I actually just got an updated set for most of the
patches currently in the for_next tree for xtensa and might have to do a
rebase to integrate them better. I'll include your fix when I come
across the issue.
Thanks again,
-Chris
On 1/12/14 7:26 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/xtensa/include/asm/barrier.h between commit dbacef090841 ("xtensa:
> add SMP support") from the xtensa tree and commit 93ea02bb8435 ("arch:
> Clean up asm/barrier.h implementations using asm-generic/barrier.h") from
> the tip tree.
>
> I fixed it up (I am pretty sure - see below) and can carry the fix as
> necessary (no action is required).
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tip tree with the xtensa tree
@ 2019-11-11 3:31 Stephen Rothwell
2019-11-11 10:04 ` Borislav Petkov
2019-11-26 21:33 ` Stephen Rothwell
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2019-11-11 3:31 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Max Filippov
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Kees Cook,
Borislav Petkov
[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/xtensa/kernel/vmlinux.lds.S
between commit:
158b6b99ba7b ("xtensa: merge .fixup with .text")
from the xtensa tree and commits:
eaf937075c9a ("vmlinux.lds.h: Move NOTES into RO_DATA")
94174c9b71c6 ("xtensa: Move EXCEPTION_TABLE to RO_DATA segment")
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 arch/xtensa/kernel/vmlinux.lds.S
index c64abc15d38f,0043d5858f14..000000000000
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@@ -124,17 -126,16 +126,15 @@@ SECTION
. = ALIGN(16);
- RODATA
+ RO_DATA(4096)
- EXCEPTION_TABLE(16)
- NOTES
- /* Relocation table */
-
- .fixup : { *(.fixup) }
-
/* Data section */
+#ifdef CONFIG_XIP_KERNEL
+ INIT_TEXT_SECTION(PAGE_SIZE)
+#else
_sdata = .;
- RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
+ RW_DATA(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
_edata = .;
/* Initialization code and data: */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the tip tree with the xtensa tree
2019-11-11 3:31 Stephen Rothwell
@ 2019-11-11 10:04 ` Borislav Petkov
2019-11-26 21:33 ` Stephen Rothwell
1 sibling, 0 replies; 6+ messages in thread
From: Borislav Petkov @ 2019-11-11 10:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Max Filippov, Linux Next Mailing List, Linux Kernel Mailing List,
Kees Cook
On Mon, Nov 11, 2019 at 02:31:54PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/xtensa/kernel/vmlinux.lds.S
>
> between commit:
>
> 158b6b99ba7b ("xtensa: merge .fixup with .text")
>
> from the xtensa tree and commits:
>
> eaf937075c9a ("vmlinux.lds.h: Move NOTES into RO_DATA")
> 94174c9b71c6 ("xtensa: Move EXCEPTION_TABLE to RO_DATA segment")
>
> 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 arch/xtensa/kernel/vmlinux.lds.S
> index c64abc15d38f,0043d5858f14..000000000000
> --- a/arch/xtensa/kernel/vmlinux.lds.S
> +++ b/arch/xtensa/kernel/vmlinux.lds.S
> @@@ -124,17 -126,16 +126,15 @@@ SECTION
>
> . = ALIGN(16);
>
> - RODATA
> + RO_DATA(4096)
>
> - EXCEPTION_TABLE(16)
> - NOTES
> - /* Relocation table */
> -
> - .fixup : { *(.fixup) }
> -
> /* Data section */
>
> +#ifdef CONFIG_XIP_KERNEL
> + INIT_TEXT_SECTION(PAGE_SIZE)
> +#else
> _sdata = .;
> - RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
> + RW_DATA(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
> _edata = .;
>
> /* Initialization code and data: */
LGTM.
Thx.
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the tip tree with the xtensa tree
2019-11-11 3:31 Stephen Rothwell
2019-11-11 10:04 ` Borislav Petkov
@ 2019-11-26 21:33 ` Stephen Rothwell
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2019-11-26 21:33 UTC (permalink / raw)
To: Max Filippov
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Linux Next Mailing List, Linux Kernel Mailing List, Kees Cook,
Borislav Petkov
[-- Attachment #1: Type: text/plain, Size: 1763 bytes --]
Hi all,
On Mon, 11 Nov 2019 14:31:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/xtensa/kernel/vmlinux.lds.S
>
> between commit:
>
> 158b6b99ba7b ("xtensa: merge .fixup with .text")
>
> from the xtensa tree and commits:
>
> eaf937075c9a ("vmlinux.lds.h: Move NOTES into RO_DATA")
> 94174c9b71c6 ("xtensa: Move EXCEPTION_TABLE to RO_DATA segment")
>
> 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 arch/xtensa/kernel/vmlinux.lds.S
> index c64abc15d38f,0043d5858f14..000000000000
> --- a/arch/xtensa/kernel/vmlinux.lds.S
> +++ b/arch/xtensa/kernel/vmlinux.lds.S
> @@@ -124,17 -126,16 +126,15 @@@ SECTION
>
> . = ALIGN(16);
>
> - RODATA
> + RO_DATA(4096)
>
> - EXCEPTION_TABLE(16)
> - NOTES
> - /* Relocation table */
> -
> - .fixup : { *(.fixup) }
> -
> /* Data section */
>
> +#ifdef CONFIG_XIP_KERNEL
> + INIT_TEXT_SECTION(PAGE_SIZE)
> +#else
> _sdata = .;
> - RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
> + RW_DATA(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
> _edata = .;
>
> /* Initialization code and data: */
This is now a conflict between the xtensa tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tip tree with the xtensa tree
@ 2014-01-13 3:26 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2014-01-13 3:26 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Chris Zankel
Cc: linux-next, linux-kernel, Max Filippov
[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/xtensa/include/asm/barrier.h between commit dbacef090841 ("xtensa:
add SMP support") from the xtensa tree and commit 93ea02bb8435 ("arch:
Clean up asm/barrier.h implementations using asm-generic/barrier.h") from
the tip tree.
I fixed it up (I am pretty sure - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/xtensa/include/asm/barrier.h
index 8e5e5c980a7a,e1ee6b51dfc5..000000000000
--- a/arch/xtensa/include/asm/barrier.h
+++ b/arch/xtensa/include/asm/barrier.h
@@@ -16,16 -13,10 +13,6 @@@
#define rmb() barrier()
#define wmb() mb()
--#ifdef CONFIG_SMP
- #define smp_mb() mb()
- #define smp_rmb() rmb()
- #define smp_wmb() wmb()
- #else
- #define smp_mb() barrier()
- #define smp_rmb() barrier()
- #define smp_wmb() barrier()
-#error smp_* not defined
--#endif
--
- #define set_mb(var, value) do { var = value; mb(); } while (0)
+ #include <asm-generic/barrier.h>
#endif /* _XTENSA_SYSTEM_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-11-26 21:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-13 3:26 linux-next: manual merge of the tip tree with the xtensa tree Stephen Rothwell
2014-01-13 3:38 ` czankel
-- strict thread matches above, loose matches on Subject: below --
2019-11-11 3:31 Stephen Rothwell
2019-11-11 10:04 ` Borislav Petkov
2019-11-26 21:33 ` Stephen Rothwell
2014-01-13 3:26 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).