Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Will Deacon:
"This is mainly a couple of email address updates to MAINTAINERS, but
we've also fixed a UAPI build issue with musl libc and an accidental
double-initialisation of our pgd_cache due to a naming conflict with a
weak symbol.

There are a couple of outstanding issues that have been reported, but
it doesn't look like they're new and we're still a long way off from
fully debugging them.

Summary:

- Fix use of #include in UAPI headers for compatability with musl libc

- Update email addresses in MAINTAINERS

- Fix initialisation of pgd_cache due to name collision with weak symbol"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64/mm: don't initialize pgd_cache twice
MAINTAINERS: Update my email address
arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h>
arm64: ssbd: explicitly depend on <linux/prctl.h>
MAINTAINERS: Update my email address to use @kernel.org

.mailmap

···
 Greg Kroah-Hartman <[e-mail]>
 Greg Kroah-Hartman <[e-mail]>
 Gregory CLEMENT <[e-mail]> <[e-mail]>
+Hanjun Guo <[e-mail]> <[e-mail]>
 Henk Vergonet <[e-mail]>
 Henrik Kretzschmar <[e-mail]>
 Henrik Rydberg <[e-mail]>
···
 Vladimir Davydov <[e-mail]> <[e-mail]>
 Vladimir Davydov <[e-mail]> <[e-mail]>
 Takashi YOSHII <[e-mail]>
+Will Deacon <[e-mail]> <[e-mail]>
 Yakir Yang <[e-mail]> <[e-mail]>
 Yusuke Goda <[e-mail]>
 Gustavo Padovan <[e-mail]>

MAINTAINERS

···
 
 ACPI FOR ARM64 (ACPI/arm64)
 M:	Lorenzo Pieralisi <[e-mail]>
-M:	Hanjun Guo <[e-mail]>
+M:	Hanjun Guo <[e-mail]>
 M:	Sudeep Holla <[e-mail]>
 L:	[e-mail]
 L:	[e-mail] (moderated for non-subscribers)
···
 F:	arch/arm/include/asm/floppy.h
 
 ARM PMU PROFILING AND DEBUGGING
-M:	Will Deacon <[e-mail]>
+M:	Will Deacon <[e-mail]>
 M:	Mark Rutland <[e-mail]>
 S:	Maintained
 L:	[e-mail] (moderated for non-subscribers)
···
 F:	drivers/irqchip/irq-vic.c
 
 ARM SMMU DRIVERS
-M:	Will Deacon <[e-mail]>
+M:	Will Deacon <[e-mail]>
 R:	Robin Murphy <[e-mail]>
 L:	[e-mail] (moderated for non-subscribers)
 S:	Maintained
···
 
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:	Catalin Marinas <[e-mail]>
-M:	Will Deacon <[e-mail]>
+M:	Will Deacon <[e-mail]>
 L:	[e-mail] (moderated for non-subscribers)
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
 S:	Maintained
···
 F:	drivers/net/wireless/atmel/atmel*
 
 ATOMIC INFRASTRUCTURE
-M:	Will Deacon <[e-mail]>
+M:	Will Deacon <[e-mail]>
 M:	Peter Zijlstra <[e-mail]>
 R:	Boqun Feng <[e-mail]>
 L:	[e-mail]
···
 LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 M:	Alan Stern <[e-mail]>
 M:	Andrea Parri <[e-mail]>
-M:	Will Deacon <[e-mail]>
+M:	Will Deacon <[e-mail]>
 M:	Peter Zijlstra <[e-mail]>
 M:	Boqun Feng <[e-mail]>
 M:	Nicholas Piggin <[e-mail]>
···
 LOCKING PRIMITIVES
 M:	Peter Zijlstra <[e-mail]>
 M:	Ingo Molnar <[e-mail]>
-M:	Will Deacon <[e-mail]>
+M:	Will Deacon <[e-mail]>
 L:	[e-mail]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
 S:	Maintained
···
 F:	arch/arm/mach-mmp/
 
 MMU GATHER AND TLB INVALIDATION
-M:	Will Deacon <[e-mail]>
+M:	Will Deacon <[e-mail]>
 M:	"Aneesh Kumar K.V" <[e-mail]>
 M:	Andrew Morton <[e-mail]>
 M:	Nick Piggin <[e-mail]>
···
 F:	drivers/pci/controller/dwc/*layerscape*
 
 PCI DRIVER FOR GENERIC OF HOSTS
-M:	Will Deacon <[e-mail]>
+M:	Will Deacon <[e-mail]>
 L:	[e-mail]
 L:	[e-mail] (moderated for non-subscribers)
 S:	Maintained

arch/arm64/include/asm/pgtable.h

···
 
 #include <asm-generic/pgtable.h>
 
-void pgd_cache_init(void);
-#define pgtable_cache_init	pgd_cache_init
+static inline void pgtable_cache_init(void) { }
 
 /*
  * On AArch64, the cache coherency is handled via the set_pte_at() function.

arch/arm64/include/uapi/asm/ptrace.h

···
 
 #ifndef __ASSEMBLY__
 
-#include <linux/prctl.h>
-
 /*
  * User structures for general purpose, floating point and debug registers.
  */
···
 
 /*
  * Common SVE_PT_* flags:
- * These must be kept in sync with prctl interface in <linux/ptrace.h>
+ * These must be kept in sync with prctl interface in <linux/prctl.h>
  */
-#define SVE_PT_VL_INHERIT		(PR_SVE_VL_INHERIT >> 16)
-#define SVE_PT_VL_ONEXEC		(PR_SVE_SET_VL_ONEXEC >> 16)
+#define SVE_PT_VL_INHERIT		((1 << 17) /* PR_SVE_VL_INHERIT */ >> 16)
+#define SVE_PT_VL_ONEXEC		((1 << 18) /* PR_SVE_SET_VL_ONEXEC */ >> 16)
 
 
 /*

arch/arm64/kernel/ssbd.c

···
 
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/prctl.h>
 #include <linux/sched.h>
 #include <linux/sched/task_stack.h>
 #include <linux/thread_info.h>