* linux-next: manual merge of the tip tree with the risc-v tree
@ 2022-05-26 3:02 Stephen Rothwell
2022-05-26 6:35 ` Guo Ren
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-05-26 3:02 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Palmer Dabbelt, Paul Walmsley
Cc: Guo Ren, Guo Ren, Ingo Molnar, Juerg Haefliger,
Linux Kernel Mailing List, Linux Next Mailing List,
Palmer Dabbelt
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/Kconfig
between commit:
0cbed0ee1dbc ("arch: Add SYSVIPC_COMPAT for all architectures")
from the risc-v tree and commit:
758cd94a0e16 ("x86/Kconfig: Fix indentation and add endif comments to arch/x86/Kconfig")
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/x86/Kconfig
index 98eaa8870f28,4d610ae216ce..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2869,7 -2861,11 +2867,7 @@@ config COMPA
if COMPAT
config COMPAT_FOR_U64_ALIGNMENT
def_bool y
- endif
-
-config SYSVIPC_COMPAT
- def_bool y
- depends on SYSVIPC
+ endif # COMPAT
endmenu
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the tip tree with the risc-v tree
2022-05-26 3:02 linux-next: manual merge of the tip tree with the risc-v tree Stephen Rothwell
@ 2022-05-26 6:35 ` Guo Ren
0 siblings, 0 replies; 2+ messages in thread
From: Guo Ren @ 2022-05-26 6:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Palmer Dabbelt, Paul Walmsley, Guo Ren, Ingo Molnar,
Juerg Haefliger, Linux Kernel Mailing List,
Linux Next Mailing List, Palmer Dabbelt
Safe manual merge, thx.
On Thu, May 26, 2022 at 11:02 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/Kconfig
>
> between commit:
>
> 0cbed0ee1dbc ("arch: Add SYSVIPC_COMPAT for all architectures")
>
> from the risc-v tree and commit:
>
> 758cd94a0e16 ("x86/Kconfig: Fix indentation and add endif comments to arch/x86/Kconfig")
>
> 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/x86/Kconfig
> index 98eaa8870f28,4d610ae216ce..000000000000
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@@ -2869,7 -2861,11 +2867,7 @@@ config COMPA
> if COMPAT
> config COMPAT_FOR_U64_ALIGNMENT
> def_bool y
> - endif
> -
> -config SYSVIPC_COMPAT
> - def_bool y
> - depends on SYSVIPC
> + endif # COMPAT
>
> endmenu
>
--
Best Regards
Guo Ren
ML: https://lore.kernel.org/linux-csky/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-26 6:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-26 3:02 linux-next: manual merge of the tip tree with the risc-v tree Stephen Rothwell
2022-05-26 6:35 ` Guo Ren
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.