linux-next: manual merge of the tip tree with the risc-v tree

linux-next: manual merge of the tip tree with the risc-v tree

[Stephen Rothwell]

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

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
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the tip tree with the risc-v tree

[Guo Ren]

Safe manual merge, thx.

On Thu, May 26, 2022 at 11:02 AM Stephen Rothwell <sfr@canb.auug.org.au> 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/

linux-next: manual merge of the tip tree with the risc-v tree

[Mark Brown]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/riscv/Kconfig

between commit:

  205cbc7148424 ("riscv: Enable ARCH_HAVE_NMI_SAFE_CMPXCHG")

from the risc-v tree and commits:

  eb3b66aab72c1 ("riscv: vdso: Untangle Kconfig logic")
  7b338f6d4e3d6 ("vdso: Drop Kconfig GENERIC_VDSO_DATA_STORE")
  bad53ae2dc429 ("vdso: Drop Kconfig GENERIC_VDSO_TIME_NS")

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.

diff --cc arch/riscv/Kconfig
index 31db5768e1e97,b346678ef6c55..0000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -53,8 -52,7 +53,8 @@@ config RISC
  	select ARCH_HAS_SYSCALL_WRAPPER
  	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
  	select ARCH_HAS_UBSAN
- 	select ARCH_HAS_VDSO_ARCH_DATA if GENERIC_VDSO_DATA_STORE
 +	select ARCH_HAVE_NMI_SAFE_CMPXCHG
+ 	select ARCH_HAS_VDSO_ARCH_DATA if HAVE_GENERIC_VDSO
  	select ARCH_KEEP_MEMBLOCK if ACPI
  	select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE	if 64BIT && MMU
  	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the tip tree with the risc-v tree

[Mark Brown]

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

Hi all,

Today's linux-next merge of the tip tree got conflicts in:

  include/uapi/linux/prctl.h
  kernel/sys.c

between commit:

  d3d1efd48b3b6 ("prctl: add arch-agnostic prctl()s for indirect branch tracking")

from the risc-v tree and commit:

  28621ec2d46c6 ("rseq: Add prctl() to enable time slice extensions")

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.

diff --cc include/uapi/linux/prctl.h
index f57098fb0ba8b,79944b7ae50aa..0000000000000
--- a/include/uapi/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
@@@ -386,31 -386,14 +386,41 @@@ struct prctl_mm_map 
  # define PR_FUTEX_HASH_SET_SLOTS	1
  # define PR_FUTEX_HASH_GET_SLOTS	2
  
 +/*
 + * Get the current indirect branch tracking configuration for the current
 + * thread, this will be the value configured via PR_SET_INDIR_BR_LP_STATUS.
 + */
 +#define PR_GET_INDIR_BR_LP_STATUS      79
 +
 +/*
 + * Set the indirect branch tracking configuration. PR_INDIR_BR_LP_ENABLE will
 + * enable cpu feature for user thread, to track all indirect branches and ensure
 + * they land on arch defined landing pad instruction.
 + * x86 - If enabled, an indirect branch must land on an ENDBRANCH instruction.
 + * arch64 - If enabled, an indirect branch must land on a BTI instruction.
 + * riscv - If enabled, an indirect branch must land on an lpad instruction.
 + * PR_INDIR_BR_LP_DISABLE will disable feature for user thread and indirect
 + * branches will no more be tracked by cpu to land on arch defined landing pad
 + * instruction.
 + */
 +#define PR_SET_INDIR_BR_LP_STATUS      80
 +# define PR_INDIR_BR_LP_ENABLE		   (1UL << 0)
 +
 +/*
 + * Prevent further changes to the specified indirect branch tracking
 + * configuration.  All bits may be locked via this call, including
 + * undefined bits.
 + */
 +#define PR_LOCK_INDIR_BR_LP_STATUS      81
 +
+ /* RSEQ time slice extensions */
 -#define PR_RSEQ_SLICE_EXTENSION			79
++#define PR_RSEQ_SLICE_EXTENSION			82
+ # define PR_RSEQ_SLICE_EXTENSION_GET		1
+ # define PR_RSEQ_SLICE_EXTENSION_SET		2
+ /*
+  * Bits for RSEQ_SLICE_EXTENSION_GET/SET
+  * PR_RSEQ_SLICE_EXT_ENABLE:	Enable
+  */
+ # define PR_RSEQ_SLICE_EXT_ENABLE		0x01
+ 
  #endif /* _LINUX_PRCTL_H */
diff --cc kernel/sys.c
index 9071422c16096,35ea9d79a42e4..0000000000000
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@@ -2883,21 -2868,11 +2883,26 @@@ SYSCALL_DEFINE5(prctl, int, option, uns
  	case PR_FUTEX_HASH:
  		error = futex_hash_prctl(arg2, arg3, arg4);
  		break;
 +	case PR_GET_INDIR_BR_LP_STATUS:
 +		if (arg3 || arg4 || arg5)
 +			return -EINVAL;
 +		error = arch_get_indir_br_lp_status(me, (unsigned long __user *)arg2);
 +		break;
 +	case PR_SET_INDIR_BR_LP_STATUS:
 +		if (arg3 || arg4 || arg5)
 +			return -EINVAL;
 +		error = arch_set_indir_br_lp_status(me, arg2);
 +		break;
 +	case PR_LOCK_INDIR_BR_LP_STATUS:
 +		if (arg3 || arg4 || arg5)
 +			return -EINVAL;
 +		error = arch_lock_indir_br_lp_status(me, arg2);
 +		break;
+ 	case PR_RSEQ_SLICE_EXTENSION:
+ 		if (arg4 || arg5)
+ 			return -EINVAL;
+ 		error = rseq_slice_extension_prctl(arg2, arg3);
+ 		break;
  	default:
  		trace_task_prctl_unknown(option, arg2, arg3, arg4, arg5);
  		error = -EINVAL;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]