Commit e9293874 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a409de61 615c48ad

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ Greg Kroah-Hartman <greg@echidna.(none)> 
Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman <greg@kroah.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>
@@ -238,6 +239,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Will Deacon <will@kernel.org> <will.deacon@arm.com>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

MAINTAINERS

+9 −9
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ F: drivers/acpi/fan.c 


ACPI FOR ARM64 (ACPI/arm64)

M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

M:	Hanjun Guo <hanjun.guo@linaro.org>

M:	Hanjun Guo <guohanjun@huawei.com>

M:	Sudeep Holla <sudeep.holla@arm.com>

L:	linux-acpi@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1235,7 +1235,7 @@ F: arch/arm/lib/floppydma.S 
F:	arch/arm/include/asm/floppy.h



ARM PMU PROFILING AND DEBUGGING

M:	Will Deacon <will.deacon@arm.com>

M:	Will Deacon <will@kernel.org>

M:	Mark Rutland <mark.rutland@arm.com>

S:	Maintained

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1307,7 +1307,7 @@ F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt 
F:	drivers/irqchip/irq-vic.c



ARM SMMU DRIVERS

M:	Will Deacon <will.deacon@arm.com>

M:	Will Deacon <will@kernel.org>

R:	Robin Murphy <robin.murphy@arm.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained
@@ -2550,7 +2550,7 @@ F: drivers/i2c/busses/i2c-xiic.c 


ARM64 PORT (AARCH64 ARCHITECTURE)

M:	Catalin Marinas <catalin.marinas@arm.com>

M:	Will Deacon <will.deacon@arm.com>

M:	Will Deacon <will@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git

S:	Maintained
@@ -2734,7 +2734,7 @@ S: Maintained 
F:	drivers/net/wireless/atmel/atmel*



ATOMIC INFRASTRUCTURE

M:	Will Deacon <will.deacon@arm.com>

M:	Will Deacon <will@kernel.org>

M:	Peter Zijlstra <peterz@infradead.org>

R:	Boqun Feng <boqun.feng@gmail.com>

L:	linux-kernel@vger.kernel.org
@@ -9121,7 +9121,7 @@ F: drivers/misc/lkdtm/* 
LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)

M:	Alan Stern <stern@rowland.harvard.edu>

M:	Andrea Parri <andrea.parri@amarulasolutions.com>

M:	Will Deacon <will.deacon@arm.com>

M:	Will Deacon <will@kernel.org>

M:	Peter Zijlstra <peterz@infradead.org>

M:	Boqun Feng <boqun.feng@gmail.com>

M:	Nicholas Piggin <npiggin@gmail.com>
@@ -9229,7 +9229,7 @@ F: Documentation/admin-guide/LSM/LoadPin.rst 
LOCKING PRIMITIVES

M:	Peter Zijlstra <peterz@infradead.org>

M:	Ingo Molnar <mingo@redhat.com>

M:	Will Deacon <will.deacon@arm.com>

M:	Will Deacon <will@kernel.org>

L:	linux-kernel@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core

S:	Maintained
@@ -10550,7 +10550,7 @@ F: arch/arm/boot/dts/mmp* 
F:	arch/arm/mach-mmp/



MMU GATHER AND TLB INVALIDATION

M:	Will Deacon <will.deacon@arm.com>

M:	Will Deacon <will@kernel.org>

M:	"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>

M:	Andrew Morton <akpm@linux-foundation.org>

M:	Nick Piggin <npiggin@gmail.com>
@@ -12039,7 +12039,7 @@ S: Maintained 
F:	drivers/pci/controller/dwc/*layerscape*



PCI DRIVER FOR GENERIC OF HOSTS

M:	Will Deacon <will.deacon@arm.com>

M:	Will Deacon <will@kernel.org>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

arch/arm64/include/asm/pgtable.h

+1 −2
Original line number Diff line number Diff line
@@ -812,8 +812,7 @@ extern int kern_addr_valid(unsigned long addr); 


#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

+3 −5
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ 


#ifndef __ASSEMBLY__



#include <linux/prctl.h>



/*

 * User structures for general purpose, floating point and debug registers.

 */
@@ -113,10 +111,10 @@ struct user_sve_header { 


/*

 * 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

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


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

CRA Git | Maintained and supported by SUSTech CRA and CCSE