From: Will Deacon <will@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Pavel Tatashin <pasha.tatashin@soleen.com>,
Mark Rutland <mark.rutland@arm.com>,
James Morse <james.morse@arm.com>
Subject: Re: linux-next: manual merge of the arm64 tree with the amr64-fixes tree
Date: Thu, 21 Nov 2019 09:31:34 +0000 [thread overview]
Message-ID: <20191121093134.GA1091@willie-the-truck> (raw)
In-Reply-To: <20191121082446.28964cd4@canb.auug.org.au>
On Thu, Nov 21, 2019 at 08:24:46AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/include/asm/asm-uaccess.h
>
> between commit:
>
> e50be648aaa3 ("arm64: uaccess: Remove uaccess_*_not_uao asm macros")
>
> from the amr64-fixes tree and commit:
>
> 582f95835a8f ("arm64: entry: convert el0_sync to C")
>
> from the arm64 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/arm64/include/asm/asm-uaccess.h
> index c764cc8fb3b6,a70575edae8e..000000000000
> --- a/arch/arm64/include/asm/asm-uaccess.h
> +++ b/arch/arm64/include/asm/asm-uaccess.h
> @@@ -57,13 -57,21 +57,4 @@@ alternative_else_nop_endi
> .macro uaccess_ttbr0_enable, tmp1, tmp2, tmp3
> .endm
> #endif
> --
> --/*
> - * Remove the address tag from a virtual address, if present.
> - * These macros are no-ops when UAO is present.
> -- */
> - .macro untagged_addr, dst, addr
> - sbfx \dst, \addr, #0, #56
> - and \dst, \dst, \addr
> - .macro uaccess_disable_not_uao, tmp1, tmp2
> - uaccess_ttbr0_disable \tmp1, \tmp2
> -alternative_if ARM64_ALT_PAN_NOT_UAO
> - SET_PSTATE_PAN(1)
> -alternative_else_nop_endif
> -- .endm
> --
> - .macro uaccess_enable_not_uao, tmp1, tmp2, tmp3
> - uaccess_ttbr0_enable \tmp1, \tmp2, \tmp3
> -alternative_if ARM64_ALT_PAN_NOT_UAO
> - SET_PSTATE_PAN(0)
> -alternative_else_nop_endif
> - .endm
Yup, that's fine. Delete both of the uaccess macros (good riddance!).
Cheers,
Will
prev parent reply other threads:[~2019-11-21 9:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 21:24 linux-next: manual merge of the arm64 tree with the amr64-fixes tree Stephen Rothwell
2019-11-21 9:31 ` Will Deacon [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=20191121093134.GA1091@willie-the-truck \
--to=will@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pasha.tatashin@soleen.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).