Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the arm64 tree with the amr64-fixes tree
@ 2019-11-20 21:24 Stephen Rothwell
  2019-11-21  9:31 ` Will Deacon
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-11-20 21:24 UTC (permalink / raw)
  To: Catalin Marinas, Will Deacon
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Pavel Tatashin, Mark Rutland, James Morse

[-- Attachment #1: Type: text/plain, Size: 1679 bytes --]

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
  #endif

[-- 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 arm64 tree with the amr64-fixes tree
  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
  0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2019-11-21  9:31 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Catalin Marinas, Linux Next Mailing List,
	Linux Kernel Mailing List, Pavel Tatashin, Mark Rutland,
	James Morse

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git