From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm•com>,
Will Deacon <will@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the vfs tree with the arm64 tree
Date: Thu, 24 Mar 2022 18:29:56 +1100 [thread overview]
Message-ID: <20220324182956.2b47b244@canb.auug.org.au> (raw)
In-Reply-To: <20220217100354.73b552d9@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2022-03-24 7:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220324182956.2b47b244@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
--cc=will@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox