Merge tag 'v5.4-rc7' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <[email protected]>

diff --combined MAINTAINERS
index 2c9a92979f4fd37e052d1f91372722ee5c19d900,eb19fad370d79b84799b83e0c6f7e5af4ae440bb..40c36aa9b7812defcb609d43b74a97faa9f68f27
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3053,6 -3053,7 +3053,7 @@@ M:      Daniel Borkmann <[email protected]
  R:    Martin KaFai Lau <[email protected]>
  R:    Song Liu <[email protected]>
  R:    Yonghong Song <[email protected]>
+ R:    Andrii Nakryiko <[email protected]>
  L:    [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
@@@ -3737,7 -3738,6 +3738,6 @@@ F:      drivers/crypto/cavium/cpt
  
  CAVIUM THUNDERX2 ARM64 SOC
  M:    Robert Richter <[email protected]>
- M:    Jayachandran C <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/cavium/thunder2-99xx*
@@@ -10519,8 -10519,12 +10519,12 @@@ F: mm/memblock.
  F:    Documentation/core-api/boot-time-mm.rst
  
  MEMORY MANAGEMENT
+ M:    Andrew Morton <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mm.org
+ T:    quilt https://ozlabs.org/~akpm/mmotm/
+ T:    quilt https://ozlabs.org/~akpm/mmots/
+ T:    git git://github.com/hnaz/linux-mm.git
  S:    Maintained
  F:    include/linux/mm.h
  F:    include/linux/gfp.h
@@@ -11408,7 -11412,6 +11412,6 @@@ F:   include/trace/events/tcp.
  NETWORKING [TLS]
  M:    Boris Pismenny <[email protected]>
  M:    Aviad Yehezkel <[email protected]>
- M:    Dave Watson <[email protected]>
  M:    John Fastabend <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  M:    Jakub Kicinski <[email protected]>
@@@ -12773,13 -12776,6 +12776,13 @@@ F: arch/*/events/
  F:    arch/*/events/*/*
  F:    tools/perf/
  
 +PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
 +R:    John Garry <[email protected]>
 +R:    Will Deacon <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    tools/perf/pmu-events/arch/arm64/
 +
  PERSONALITY HANDLING
  M:    Christoph Hellwig <[email protected]>
  L:    [email protected]
@@@ -13913,7 -13909,7 +13916,7 @@@ F:   drivers/mtd/nand/raw/r852.
  
  RISC-V ARCHITECTURE
  M:    Paul Walmsley <[email protected]>
- M:    Palmer Dabbelt <palmer@sifive.com>
+ M:    Palmer Dabbelt <palmer@dabbelt.com>
  M:    Albert Ou <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
@@@ -14790,7 -14786,7 +14793,7 @@@ F:   drivers/media/usb/siano
  F:    drivers/media/mmc/siano/
  
  SIFIVE DRIVERS
- M:    Palmer Dabbelt <palmer@sifive.com>
+ M:    Palmer Dabbelt <palmer@dabbelt.com>
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  T:    git git://github.com/sifive/riscv-linux.git
@@@ -14800,7 -14796,7 +14803,7 @@@ N:   sifiv
  
  SIFIVE FU540 SYSTEM-ON-CHIP
  M:    Paul Walmsley <[email protected]>
- M:    Palmer Dabbelt <palmer@sifive.com>
+ M:    Palmer Dabbelt <palmer@dabbelt.com>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git
  S:    Supported
@@@ -17342,6 -17338,12 +17345,12 @@@ F: include/linux/vbox_utils.
  F:    include/uapi/linux/vbox*.h
  F:    drivers/virt/vboxguest/
  
+ VIRTUAL BOX SHARED FOLDER VFS DRIVER:
+ M:    Hans de Goede <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/staging/vboxsf/*
+ 
  VIRTUAL SERIO DEVICE DRIVER
  M:    Stephen Chandler Paul <[email protected]>
  S:    Maintained
@@@ -18042,6 -18044,7 +18051,7 @@@ F:   Documentation/vm/zsmalloc.rs
  ZSWAP COMPRESSED SWAP CACHING
  M:    Seth Jennings <[email protected]>
  M:    Dan Streetman <[email protected]>
+ M:    Vitaly Wool <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    mm/zswap.c

diff --combined include/linux/security.h
index 0a86bfea64d05a1ab1c09b387e3c44daebe4ec9c,9df7547afc0cb783883b5c5c7b32b2956a650d7a..06ff668345012e7a618703d2e746435ba7bfa24c
--- 1/include/linux/security.h
--- 2/include/linux/security.h
+++ b/include/linux/security.h
@@@ -105,6 -105,7 +105,7 @@@ enum lockdown_reason 
        LOCKDOWN_NONE,
        LOCKDOWN_MODULE_SIGNATURE,
        LOCKDOWN_DEV_MEM,
+       LOCKDOWN_EFI_TEST,
        LOCKDOWN_KEXEC,
        LOCKDOWN_HIBERNATION,
        LOCKDOWN_PCI_ACCESS,
@@@ -1894,42 -1895,5 +1895,42 @@@ static inline void security_bpf_prog_fr
  #endif /* CONFIG_SECURITY */
  #endif /* CONFIG_BPF_SYSCALL */
  
 -#endif /* ! __LINUX_SECURITY_H */
 +#ifdef CONFIG_PERF_EVENTS
 +struct perf_event_attr;
 +struct perf_event;
 +
 +#ifdef CONFIG_SECURITY
 +extern int security_perf_event_open(struct perf_event_attr *attr, int type);
 +extern int security_perf_event_alloc(struct perf_event *event);
 +extern void security_perf_event_free(struct perf_event *event);
 +extern int security_perf_event_read(struct perf_event *event);
 +extern int security_perf_event_write(struct perf_event *event);
 +#else
 +static inline int security_perf_event_open(struct perf_event_attr *attr,
 +                                         int type)
 +{
 +      return 0;
 +}
 +
 +static inline int security_perf_event_alloc(struct perf_event *event)
 +{
 +      return 0;
 +}
 +
 +static inline void security_perf_event_free(struct perf_event *event)
 +{
 +}
 +
 +static inline int security_perf_event_read(struct perf_event *event)
 +{
 +      return 0;
 +}
  
 +static inline int security_perf_event_write(struct perf_event *event)
 +{
 +      return 0;
 +}
 +#endif /* CONFIG_SECURITY */
 +#endif /* CONFIG_PERF_EVENTS */
 +
 +#endif /* ! __LINUX_SECURITY_H */