* linux-next: manual merge of the vfs tree with the arm64 tree
@ 2022-02-16 23:03 Stephen Rothwell
2022-03-24 7:29 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-02-16 23:03 UTC (permalink / raw)
To: Al Viro, Catalin Marinas, Will Deacon
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
arch/x86/um/Kconfig
between commit:
b62a8486de3a ("elfcore: Replace CONFIG_{IA64, UML} checks with a new option")
from the arm64 tree and commit:
6692531df62d ("uml/x86: use x86 load_unaligned_zeropad()")
from the vfs 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/um/Kconfig
index ead7e5b3a975,4eb47d3ba625..000000000000
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@@ -8,7 -8,7 +8,8 @@@ endmen
config UML_X86
def_bool y
+ select ARCH_BINFMT_ELF_EXTRA_PHDRS if X86_32
+ select DCACHE_WORD_ACCESS
config 64BIT
bool "64-bit kernel" if "$(SUBARCH)" = "x86"
[-- 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 vfs tree with the arm64 tree
2022-02-16 23:03 linux-next: manual merge of the vfs tree with the arm64 tree Stephen Rothwell
@ 2022-03-24 7:29 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-03-24 7:29 UTC (permalink / raw)
To: Al Viro
Cc: Catalin Marinas, Will Deacon, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]
Hi all,
On Thu, 17 Feb 2022 10:03:54 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> arch/x86/um/Kconfig
>
> between commit:
>
> b62a8486de3a ("elfcore: Replace CONFIG_{IA64, UML} checks with a new option")
>
> from the arm64 tree and commit:
>
> 6692531df62d ("uml/x86: use x86 load_unaligned_zeropad()")
>
> from the vfs 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.
>
>
> diff --cc arch/x86/um/Kconfig
> index ead7e5b3a975,4eb47d3ba625..000000000000
> --- a/arch/x86/um/Kconfig
> +++ b/arch/x86/um/Kconfig
> @@@ -8,7 -8,7 +8,8 @@@ endmen
>
> config UML_X86
> def_bool y
> + select ARCH_BINFMT_ELF_EXTRA_PHDRS if X86_32
> + select DCACHE_WORD_ACCESS
>
> config 64BIT
> bool "64-bit kernel" if "$(SUBARCH)" = "x86"
This is now a conflict between the vfs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-24 7:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-16 23:03 linux-next: manual merge of the vfs tree with the arm64 tree Stephen Rothwell
2022-03-24 7:29 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox