Merge remote-tracking branch 'torvalds/master' into perf/core

To sync with libbpf, etc.

Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --combined MAINTAINERS
index 7060ba8c6146e2c1d1c120b0d457d11c05d18bce,fb1471cb5ed3dc1b1b8582e6ba3ace5a35c767ea..66b5d5a51d5b1110d637dbde2173261fc62a7baf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1097,7 -1097,6 +1097,6 @@@ S:      Maintaine
  F:    drivers/dma/ptdma/
  
  AMD SEATTLE DEVICE TREE SUPPORT
- M:    Brijesh Singh <[email protected]>
  M:    Suravee Suthikulpanit <[email protected]>
  M:    Tom Lendacky <[email protected]>
  S:    Supported
@@@ -2212,6 -2211,9 +2211,9 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
  X:    drivers/media/i2c/
+ F:    arch/arm64/boot/dts/freescale/
+ X:    arch/arm64/boot/dts/freescale/fsl-*
+ X:    arch/arm64/boot/dts/freescale/qoriq-*
  N:    imx
  N:    mxs
  
@@@ -2450,11 -2452,14 +2452,14 @@@ F:   drivers/rtc/rtc-mt7622.
  
  ARM/Mediatek SoC support
  M:    Matthias Brugger <[email protected]>
+ R:    AngeloGioacchino Del Regno <[email protected]>
+ L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    https://mtk.wiki.kernel.org/
- C:    irc://chat.freenode.net/linux-mediatek
+ C:    irc://irc.libera.chat/linux-mediatek
+ F:    arch/arm/boot/dts/mt2*
  F:    arch/arm/boot/dts/mt6*
  F:    arch/arm/boot/dts/mt7*
  F:    arch/arm/boot/dts/mt8*
@@@ -2462,7 -2467,7 +2467,7 @@@ F:      arch/arm/mach-mediatek
  F:    arch/arm64/boot/dts/mediatek/
  F:    drivers/soc/mediatek/
  N:    mtk
- N:    mt[678]
+ N:    mt[2678]
  K:    mediatek
  
  ARM/Mediatek USB3 PHY DRIVER
@@@ -3766,7 -3771,6 +3771,6 @@@ F:      net/bluetooth
  
  BONDING DRIVER
  M:    Jay Vosburgh <[email protected]>
- M:    Veaceslav Falico <[email protected]>
  M:    Andy Gospodarek <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -7615,7 -7619,6 +7619,6 @@@ S:      Maintaine
  F:    drivers/firmware/efi/test/
  
  EFI VARIABLE FILESYSTEM
- M:    Matthew Garrett <[email protected]>
  M:    Jeremy Kerr <[email protected]>
  M:    Ard Biesheuvel <[email protected]>
  L:    [email protected]
@@@ -7894,7 -7897,11 +7897,11 @@@ F:    include/linux/extcon
  
  EXTRA BOOT CONFIG
  M:    Masami Hiramatsu <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ Q:    https://patchwork.kernel.org/project/linux-trace-kernel/list/
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
  F:    Documentation/admin-guide/bootconfig.rst
  F:    fs/proc/bootconfig.c
  F:    include/linux/bootconfig.h
@@@ -8467,16 -8474,16 +8474,16 @@@ F:   fs/fscache
  F:    include/linux/fscache*.h
  
  FSCRYPT: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
+ M:    Eric Biggers <[email protected]>
  M:    Theodore Y. Ts'o <[email protected]>
  M:    Jaegeuk Kim <[email protected]>
- M:    Eric Biggers <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-fscrypt/list/
- T:    git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git
+ T:    git https://git.kernel.org/pub/scm/fs/fscrypt/linux.git
  F:    Documentation/filesystems/fscrypt.rst
  F:    fs/crypto/
- F:    include/linux/fscrypt*.h
+ F:    include/linux/fscrypt.h
  F:    include/uapi/linux/fscrypt.h
  
  FSI SUBSYSTEM
@@@ -8519,10 -8526,10 +8526,10 @@@ F:   include/linux/fsnotify*.
  FSVERITY: READ-ONLY FILE-BASED AUTHENTICITY PROTECTION
  M:    Eric Biggers <[email protected]>
  M:    Theodore Y. Ts'o <[email protected]>
- L:    [email protected]
+ L:    [email protected]
  S:    Supported
- Q:    https://patchwork.kernel.org/project/linux-fscrypt/list/
- T:    git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity
+ Q:    https://patchwork.kernel.org/project/fsverity/list/
+ T:    git https://git.kernel.org/pub/scm/fs/fsverity/linux.git
  F:    Documentation/filesystems/fsverity.rst
  F:    fs/verity/
  F:    include/linux/fsverity.h
@@@ -8570,6 -8577,7 +8577,7 @@@ F:      kernel/trace/fgraph.
  F:    arch/*/*/*/*ftrace*
  F:    arch/*/*/*ftrace*
  F:    include/*/ftrace.h
+ F:    samples/ftrace
  
  FUNGIBLE ETHERNET DRIVERS
  M:    Dimitris Michailidis <[email protected]>
@@@ -14600,7 -14608,6 +14608,6 @@@ F:   tools/testing/selftests/net/ipsec.
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
- M:    Hideaki YOSHIFUJI <[email protected]>
  M:    David Ahern <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14633,7 -14640,6 +14640,6 @@@ F:   net/netfilter/xt_SECMARK.
  F:    net/netlabel/
  
  NETWORKING [MPTCP]
- M:    Mat Martineau <[email protected]>
  M:    Matthieu Baerts <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15658,7 -15664,7 +15664,7 @@@ OPENRISC ARCHITECTUR
  M:    Jonas Bonn <[email protected]>
  M:    Stefan Kristiansson <[email protected]>
  M:    Stafford Horne <[email protected]>
- L:    [email protected].org
+ L:    [email protected].org
  S:    Maintained
  W:    http://openrisc.io
  T:    git https://github.com/openrisc/linux.git
@@@ -16418,7 -16424,6 +16424,7 @@@ R:   Mark Rutland <[email protected]
  R:    Alexander Shishkin <[email protected]>
  R:    Jiri Olsa <[email protected]>
  R:    Namhyung Kim <[email protected]>
 +R:    Ian Rogers <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -17963,6 -17968,7 +17969,7 @@@ M:   Albert Ou <[email protected]
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-riscv/list/
+ C:    irc://irc.libera.chat/riscv
  P:    Documentation/riscv/patch-acceptance.rst
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
  F:    arch/riscv/
@@@ -18684,9 -18690,9 +18691,9 @@@ F:   drivers/target
  F:    include/target/
  
  SCTP PROTOCOL
- M:    Vlad Yasevich <[email protected]>
  M:    Neil Horman <[email protected]>
  M:    Marcelo Ricardo Leitner <[email protected]>
+ M:    Xin Long <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://lksctp.sourceforge.net
@@@ -21724,6 -21730,7 +21731,7 @@@ F:   include/uapi/linux/uvcvideo.
  
  USB WEBCAM GADGET
  M:    Laurent Pinchart <[email protected]>
+ M:    Daniel Scally <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/usb/gadget/function/*uvc*