Hi all,

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

  arch/arm64/include/asm/gcs.h

between commits:

  ea920b50ac9ff ("arm64: uaccess: Move existing GCS accessors definitions to gcs.h")
  9cd2a7f1180f9 ("arm64: uaccess: Add additional userspace GCS accessors")

from the arm64 tree and commit:

  053b5d3aac293 ("arm64/gcs: Return a success value from gcs_alloc_thread_stack()")

from the fs-next 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

diff --cc arch/arm64/include/asm/gcs.h
index 8fa0707069e8b,b4bbec9382a19..0000000000000
--- a/arch/arm64/include/asm/gcs.h
+++ b/arch/arm64/include/asm/gcs.h
@@@ -167,12 -91,8 +167,12 @@@ static inline bool task_gcs_el0_enabled
  static inline void gcs_set_el0_mode(struct task_struct *task) { }
  static inline void gcs_free(struct task_struct *task) { }
  static inline void gcs_preserve_current_state(void) { }
 +static inline void put_user_gcs(unsigned long val, unsigned long __user *addr,
 +				int *err) { }
 +static inline void push_user_gcs(unsigned long val, int *err) { }
 +
- static inline unsigned long gcs_alloc_thread_stack(struct task_struct *tsk,
- 						   const struct kernel_clone_args *args)
+ static inline int gcs_alloc_thread_stack(struct task_struct *tsk,
+ 					 const struct kernel_clone_args *args)
  {
  	return -ENOTSUPP;
  }
complex conflicts.