Safe manual merge, thx.
On Thu, May 26, 2022 at 11:02 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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/
