Merge tag 'v5.10-rc6' into patchwork

Linux 5.10-rc6

* tag 'v5.10-rc6': (1815 commits)
  Linux 5.10-rc6
  sock: set sk_err to ee_errno on dequeue from errq
  mptcp: fix NULL ptr dereference on bad MPJ
  net: openvswitch: fix TTL decrement action netlink message format
  perf probe: Change function definition check due to broken DWARF
  perf probe: Fix to die_entrypc() returns error correctly
  perf stat: Use proper cpu for shadow stats
  perf record: Synthesize cgroup events only if needed
  perf diff: Fix error return value in __cmd_diff()
  perf tools: Update copy of libbpf's hashmap.c
  x86/mce: Do not overwrite no_way_out if mce_end() fails
  kvm: x86/mmu: Fix get_mmio_spte() on CPUs supporting 5-level PT
  KVM: x86: Fix split-irqchip vs interrupt injection window request
  KVM: x86: handle !lapic_in_kernel case in kvm_cpu_*_extint
  usb: typec: stusb160x: fix power-opmode property with typec-power-opmode
  printk: finalize records with trailing newlines
  can: af_can: can_rx_unregister(): remove WARN() statement from list operation sanity check
  can: m_can: m_can_dev_setup(): add support for bosch mcan version 3.3.0
  can: m_can: fix nominal bitiming tseg2 min for version >= 3.1
  can: m_can: m_can_open(): remove IRQF_TRIGGER_FALLING from request_threaded_irq()'s flags
  ...

diff --combined MAINTAINERS
index e3a828249c8c68388d6854175859feddcefc35cc,2daa6ee673f7f272967a0c14ce34a4e19280d3a8..a22392994667da39671a49c1d82ff0f78f7f313e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -934,7 -934,7 +934,7 @@@ M: Evan Quan <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://people.freedesktop.org/~agd5f/linux
- F:    drivers/gpu/drm/amd/powerplay/
+ F:    drivers/gpu/drm/amd/pm/powerplay/
  
  AMD SEATTLE DEVICE TREE SUPPORT
  M:    Brijesh Singh <[email protected]>
@@@ -978,7 -978,7 +978,7 @@@ M: Michael Hennerich <Michael.Hennerich
  L:    [email protected]
  S:    Supported
  W:    http://ez.analog.com/community/linux-device-drivers
- F:    Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
+ F:    Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
  F:    drivers/iio/adc/ad7768-1.c
  
  ANALOG DEVICES INC AD7780 DRIVER
@@@ -1073,7 -1073,6 +1073,7 @@@ M:      Hans Verkuil <hverkuil-cisco@xs4all.
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adv7604*
 +F:    Documentation/devicetree/bindings/media/i2c/adv7604.yaml
  
  ANALOG DEVICES INC ADV7842 DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -1280,7 -1279,7 +1280,7 @@@ M:      Igor Russkikh <[email protected]
  L:    [email protected]
  S:    Supported
  W:    https://www.marvell.com/
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst
  F:    drivers/net/ethernet/aquantia/atlantic/
  
@@@ -1547,6 -1546,7 +1547,7 @@@ F:      drivers/clk/sunxi
  ARM/Allwinner sunXi SoC support
  M:    Maxime Ripard <[email protected]>
  M:    Chen-Yu Tsai <[email protected]>
+ R:    Jernej Skrabec <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@@ -1724,11 -1724,13 +1725,13 @@@ F:   arch/arm/mach-ep93xx/micro9.
  
  ARM/CORESIGHT FRAMEWORK AND DRIVERS
  M:    Mathieu Poirier <[email protected]>
- R:    Suzuki K Poulose <[email protected]>
+ M:    Suzuki K Poulose <[email protected]>
  R:    Mike Leach <[email protected]>
+ R:    Leo Yan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
  F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
  F:    Documentation/devicetree/bindings/arm/coresight-cti.yaml
@@@ -1995,7 -1997,6 +1998,6 @@@ N:      lpc18x
  
  ARM/LPC32XX SOC SUPPORT
  M:    Vladimir Zapolskiy <[email protected]>
- M:    Sylvain Lemieux <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/vzapolskiy/linux-lpc32xx.git
@@@ -2375,8 -2376,7 +2377,7 @@@ F:      drivers/i2c/busses/i2c-rk3x.
  F:    sound/soc/rockchip/
  N:    rockchip
  
- ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
- M:    Kukjin Kim <[email protected]>
+ ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
  M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -2405,15 -2405,7 +2406,7 @@@ N:     s3c241
  N:    s3c64xx
  N:    s5pv210
  
- ARM/SAMSUNG MOBILE MACHINE SUPPORT
- M:    Kyungmin Park <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- S:    Maintained
- F:    arch/arm/mach-s5pv210/
- 
  ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
- M:    Kyungmin Park <[email protected]>
- M:    Kamil Debski <[email protected]>
  M:    Andrzej Hajda <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -2438,9 -2430,6 +2431,6 @@@ S:      Maintaine
  F:    drivers/media/platform/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
- M:    Kyungmin Park <[email protected]>
- M:    Kamil Debski <[email protected]>
- M:    Jeongtae Park <[email protected]>
  M:    Andrzej Hajda <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -2643,10 -2632,8 +2633,8 @@@ F:     drivers/pinctrl/visconti
  N:    visconti
  
  ARM/UNIPHIER ARCHITECTURE
- M:    Masahiro Yamada <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
- S:    Maintained
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
+ S:    Orphan
  F:    Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
  F:    Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
  F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
@@@ -3247,10 -3234,10 +3235,10 @@@ F:   drivers/iio/accel/bma400
  BPF (Safe dynamic programs and tools)
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
+ M:    Andrii Nakryiko <[email protected]>
  R:    Martin KaFai Lau <[email protected]>
  R:    Song Liu <[email protected]>
  R:    Yonghong Song <[email protected]>
- R:    Andrii Nakryiko <[email protected]>
  R:    John Fastabend <[email protected]>
  R:    KP Singh <[email protected]>
  L:    [email protected]
@@@ -3542,11 -3529,12 +3530,12 @@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
  M:    Arend van Spriel <[email protected]>
  M:    Franky Lin <[email protected]>
  M:    Hante Meuleman <[email protected]>
- M:    Chi-Hsien Lin <[email protected]>
- M:    Wright Feng <[email protected]>
+ M:    Chi-hsien Lin <[email protected]>
+ M:    Wright Feng <[email protected]>
+ M:    Chung-hsien Hsu <[email protected]>
  L:    [email protected]
  L:    [email protected]
- L:    brcm80211-dev-list@cypress.com
+ L:    SHA-cyfmac-dev-list@infineon.com
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
  
@@@ -3861,7 -3849,7 +3850,7 @@@ M:      Roger Quadros <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
- F:    Documentation/devicetree/bindings/usb/cdns-usb3.txt
+ F:    Documentation/devicetree/bindings/usb/cdns,usb3.yaml
  F:    drivers/usb/cdns3/
  
  CADET FM/AM RADIO RECEIVER DRIVER
@@@ -4355,7 -4343,7 +4344,7 @@@ CODA V4L2 MEM2MEM DRIVE
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/media/coda.txt
 +F:    Documentation/devicetree/bindings/media/coda.yaml
  F:    drivers/media/platform/coda/
  
  CODE OF CONDUCT
@@@ -4714,7 -4702,7 +4703,7 @@@ T:      git git://linuxtv.org/anttip/media_t
  F:    drivers/media/dvb-frontends/cxd2820r*
  
  CXGB3 ETHERNET DRIVER (CXGB3)
- M:    Vishal Kulkarni <vishal@chelsio.com>
+ M:    Raju Rangoju <rajur@chelsio.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.chelsio.com
@@@ -4746,7 -4734,7 +4735,7 @@@ W:      http://www.chelsio.co
  F:    drivers/net/ethernet/chelsio/inline_crypto/
  
  CXGB4 ETHERNET DRIVER (CXGB4)
- M:    Vishal Kulkarni <vishal@chelsio.com>
+ M:    Raju Rangoju <rajur@chelsio.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.chelsio.com
@@@ -4768,7 -4756,7 +4757,7 @@@ F:      drivers/infiniband/hw/cxgb4
  F:    include/uapi/rdma/cxgb4-abi.h
  
  CXGB4VF ETHERNET DRIVER (CXGB4VF)
- M:    Vishal Kulkarni <vishal@gmail.com>
+ M:    Raju Rangoju <rajur@chelsio.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.chelsio.com
@@@ -5007,9 -4995,8 +4996,8 @@@ T:      git git://linuxtv.org/media_tree.gi
  F:    drivers/media/platform/sti/delta
  
  DENALI NAND DRIVER
- M:    Masahiro Yamada <[email protected]>
  L:    [email protected]
- S:    Supported
+ S:    Orphan
  F:    drivers/mtd/nand/raw/denali*
  
  DESIGNWARE EDMA CORE IP DRIVER
@@@ -6619,6 -6606,7 +6607,7 @@@ Q:      http://patchwork.ozlabs.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
  F:    Documentation/filesystems/ext4/
  F:    fs/ext4/
+ F:    include/trace/events/ext4.h
  
  Extended Verification Module (EVM)
  M:    Mimi Zohar <[email protected]>
@@@ -7921,7 -7909,7 +7910,7 @@@ HISILICON LPC BUS DRIVE
  M:    [email protected]
  S:    Maintained
  W:    http://www.hisilicon.com
- F:    Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt
+ F:    Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml
  F:    drivers/bus/hisi_lpc.c
  
  HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
@@@ -8834,8 -8822,8 +8823,8 @@@ S:      Supporte
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
  Q:    http://patchwork.ozlabs.org/project/intel-wired-lan/list/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git
  F:    Documentation/networking/device_drivers/ethernet/intel/
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
@@@ -8977,22 -8965,6 +8966,6 @@@ S:     Supporte
  W:    https://01.org/linux-acpi
  F:    drivers/platform/x86/intel_menlow.c
  
- INTEL MIC DRIVERS (mic)
- M:    Sudeep Dutt <[email protected]>
- M:    Ashutosh Dixit <[email protected]>
- S:    Supported
- W:    https://github.com/sudeepdutt/mic
- W:    http://software.intel.com/en-us/mic-developer
- F:    Documentation/misc-devices/mic/
- F:    drivers/dma/mic_x100_dma.c
- F:    drivers/dma/mic_x100_dma.h
- F:    drivers/misc/mic/
- F:    include/linux/mic_bus.h
- F:    include/linux/scif.h
- F:    include/uapi/linux/mic_common.h
- F:    include/uapi/linux/mic_ioctl.h
- F:    include/uapi/linux/scif_ioctl.h
- 
  INTEL P-Unit IPC DRIVER
  M:    Zha Qipeng <[email protected]>
  L:    [email protected]
@@@ -9192,6 -9164,7 +9165,7 @@@ F:      include/linux/iomap.
  
  IOMMU DRIVERS
  M:    Joerg Roedel <[email protected]>
+ M:    Will Deacon <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -9675,6 -9648,7 +9649,7 @@@ F:      Documentation/virt/kvm/s390
  F:    arch/s390/include/asm/gmap.h
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/include/uapi/asm/kvm*
+ F:    arch/s390/kernel/uv.c
  F:    arch/s390/kvm/
  F:    arch/s390/mm/gmap.c
  F:    tools/testing/selftests/kvm/*/s390x/
@@@ -9863,13 -9837,6 +9838,6 @@@ S:     Maintaine
  F:    arch/mips/lantiq
  F:    drivers/soc/lantiq
  
- LAPB module
- L:    [email protected]
- S:    Orphan
- F:    Documentation/networking/lapb-module.rst
- F:    include/*/lapb.h
- F:    net/lapb/
- 
  LASI 53c700 driver for PARISC
  M:    "James E.J. Bottomley" <[email protected]>
  L:    [email protected]
@@@ -10849,8 -10816,8 +10817,8 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/imx7.rst
 -F:    Documentation/devicetree/bindings/media/imx7-csi.txt
 -F:    Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
 +F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
 +F:    Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
  F:    drivers/staging/media/imx/imx7-media-csi.c
  F:    drivers/staging/media/imx/imx7-mipi-csis.c
  
@@@ -11184,7 -11151,7 +11152,7 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/input/touchscreen/melfas_mip4.c
  
  MELLANOX BLUEFIELD I2C DRIVER
- M:    Khalil Blaiech <kblaiech@mellanox.com>
+ M:    Khalil Blaiech <kblaiech@nvidia.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/i2c/busses/i2c-mlxbf.c
@@@ -11194,7 -11161,7 +11162,7 @@@ M:   Tariq Toukan <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.mellanox.com
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx4/en_*
  
  MELLANOX ETHERNET DRIVER (mlx5e)
@@@ -11202,7 -11169,7 +11170,7 @@@ M:   Saeed Mahameed <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.mellanox.com
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
  
  MELLANOX ETHERNET INNOVA DRIVERS
@@@ -11210,7 -11177,7 +11178,7 @@@ R:   Boris Pismenny <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.mellanox.com
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
@@@ -11222,7 -11189,7 +11190,7 @@@ M:   Ido Schimmel <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.mellanox.com
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlxsw/
  F:    tools/testing/selftests/drivers/net/mlxsw/
  
@@@ -11231,7 -11198,7 +11199,7 @@@ M:   [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.mellanox.com
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlxfw/
  
  MELLANOX HARDWARE PLATFORM SUPPORT
@@@ -11250,7 -11217,7 +11218,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.mellanox.com
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx4/
  F:    include/linux/mlx4/
  
@@@ -11271,7 -11238,7 +11239,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.mellanox.com
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    Documentation/networking/device_drivers/ethernet/mellanox/
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
@@@ -11932,7 -11899,7 +11900,7 @@@ M:   Jacopo Mondi <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt
 +F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
  F:    drivers/media/i2c/mt9v111.c
  
  MULTIFUNCTION DEVICES (MFD)
@@@ -12151,7 -12118,7 +12119,7 @@@ M:   Jakub Kicinski <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    http://www.linuxfoundation.org/en/Net
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
  F:    Documentation/devicetree/bindings/net/
@@@ -12196,7 -12163,7 +12164,7 @@@ M:   Jakub Kicinski <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    http://www.linuxfoundation.org/en/Net
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  B:    mailto:[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
@@@ -12889,7 -12856,7 +12857,7 @@@ M:   Rui Miguel Silva <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/ov2680.txt
 +F:    Documentation/devicetree/bindings/media/i2c/ov2680.yaml
  F:    drivers/media/i2c/ov2680.c
  
  OMNIVISION OV2685 SENSOR DRIVER
@@@ -12959,7 -12926,7 +12927,7 @@@ M:   Jacopo Mondi <[email protected]
  L:    [email protected]
  S:    Odd fixes
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/ov772x.txt
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml
  F:    drivers/media/i2c/ov772x.c
  F:    include/media/i2c/ov772x.h
  
@@@ -12995,14 -12962,6 +12963,14 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/i2c/ov9650.txt
  F:    drivers/media/i2c/ov9650.c
  
 +OMNIVISION OV9734 SENSOR DRIVER
 +M:    Tianshu Qiu <[email protected]>
 +R:    Bingbu Cao <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov9734.c
 +
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
@@@ -13205,7 -13164,9 +13173,9 @@@ M:   Jesper Dangaard Brouer <hawk@kernel.
  M:    Ilias Apalodimas <[email protected]>
  L:    [email protected]
  S:    Supported
+ F:    Documentation/networking/page_pool.rst
  F:    include/net/page_pool.h
+ F:    include/trace/events/page_pool.h
  F:    net/core/page_pool.c
  
  PANASONIC LAPTOP ACPI EXTRAS DRIVER
@@@ -14239,7 -14200,6 +14209,6 @@@ F:   drivers/media/usb/pwc/
  F:    include/trace/events/pwc.h
  
  PWM FAN DRIVER
- M:    Kamil Debski <[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -14475,7 -14435,6 +14444,7 @@@ W:   https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/ath9k/
  
  QUALCOMM CAMERA SUBSYSTEM DRIVER
 +M:    Robert Foss <[email protected]>
  M:    Todor Tomov <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14557,6 -14516,14 +14526,14 @@@ F: Documentation/devicetree/bindings/ma
  F:    drivers/mailbox/qcom-ipcc.c
  F:    include/dt-bindings/mailbox/qcom-ipcc.h
  
+ QUALCOMM IPQ4019 VQMMC REGULATOR DRIVER
+ M:    Robert Marko <[email protected]>
+ M:    Luka Perkov <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
+ F:    drivers/regulator/vqmmc-ipq4019-regulator.c
+ 
  QUALCOMM RMNET DRIVER
  M:    Subash Abhinov Kasiviswanathan <[email protected]>
  M:    Sean Tranchetti <[email protected]>
@@@ -14841,7 -14808,7 +14818,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/net/wireless/realtek/rtlwifi/
  
  REALTEK WIRELESS DRIVER (rtw88)
- M:    Yan-Hsuan Chuang <yhchuang@realtek.com>
+ M:    Yan-Hsuan Chuang <tony0620emma@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtw88/
@@@ -14912,7 -14879,6 +14889,6 @@@ RENESAS ETHERNET DRIVER
  R:    Sergei Shtylyov <[email protected]>
  L:    [email protected]
  L:    [email protected]
- F:    Documentation/devicetree/bindings/net/renesas,*.txt
  F:    Documentation/devicetree/bindings/net/renesas,*.yaml
  F:    drivers/net/ethernet/renesas/
  F:    include/linux/sh_eth.h
@@@ -15042,13 -15008,10 +15018,13 @@@ ROCKCHIP ISP V1 DRIVE
  M:    Helen Koike <[email protected]>
  M:    Dafna Hirschfeld <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/media/rkisp1.rst
 +F:    Documentation/devicetree/bindings/media/rockchip-isp1.yaml
  F:    Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
 -F:    drivers/staging/media/rkisp1/
 +F:    drivers/media/platform/rockchip/rkisp1
 +F:    include/uapi/linux/rkisp1-config.h
  
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
  M:    Jacob Chen <[email protected]>
@@@ -15272,7 -15235,6 +15248,6 @@@ F:   drivers/iommu/s390-iommu.
  S390 IUCV NETWORK LAYER
  M:    Julian Wiedmann <[email protected]>
  M:    Karsten Graul <[email protected]>
- M:    Ursula Braun <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -15283,7 -15245,6 +15258,6 @@@ F:   net/iucv
  S390 NETWORK DRIVERS
  M:    Julian Wiedmann <[email protected]>
  M:    Karsten Graul <[email protected]>
- M:    Ursula Braun <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -15385,7 -15346,6 +15359,6 @@@ F:   security/safesetid
  
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
- M:    Sangbeom Kim <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -15420,7 -15380,6 +15393,6 @@@ S:   Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
- M:    Sangbeom Kim <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
@@@ -15454,14 -15413,12 +15426,12 @@@ F:        Documentation/devicetree/bindings/ne
  F:    drivers/nfc/s3fwrn5
  
  SAMSUNG S5C73M3 CAMERA DRIVER
- M:    Kyungmin Park <[email protected]>
  M:    Andrzej Hajda <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/media/i2c/s5c73m3/*
  
  SAMSUNG S5K5BAF CAMERA DRIVER
- M:    Kyungmin Park <[email protected]>
  M:    Andrzej Hajda <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -15479,7 -15436,6 +15449,6 @@@ F:   Documentation/devicetree/bindings/cr
  F:    drivers/crypto/s5p-sss.c
  
  SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
- M:    Kyungmin Park <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -15502,7 -15458,6 +15471,6 @@@ F:   include/linux/clk/samsung.
  F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
- M:    Kukjin Kim <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Andi Shyti <[email protected]>
  L:    [email protected]
@@@ -15528,7 -15483,6 +15496,6 @@@ T:   git https://github.com/lmajewski/lin
  F:    drivers/thermal/samsung/
  
  SAMSUNG USB2 PHY DRIVER
- M:    Kamil Debski <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -15827,9 -15781,8 +15794,8 @@@ F:   drivers/slimbus
  F:    include/linux/slimbus.h
  
  SFC NETWORK DRIVER
- M:    Solarflare linux maintainers <[email protected]>
- M:    Edward Cree <[email protected]>
- M:    Martin Habets <[email protected]>
+ M:    Edward Cree <[email protected]>
+ M:    Martin Habets <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/sfc/
@@@ -15857,7 -15810,6 +15823,6 @@@ S:   Maintaine
  F:    drivers/misc/sgi-xp/
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
- M:    Ursula Braun <[email protected]>
  M:    Karsten Graul <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -16310,7 -16262,7 +16275,7 @@@ M:   Ricardo Ribalda <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
 +F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
  F:    drivers/media/i2c/imx214.c
  
  SONY IMX219 SENSOR DRIVER
@@@ -18119,7 -18071,7 +18084,7 @@@ M:   Yu Chen <[email protected]
  M:    Binghui Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt
+ F:    Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
  F:    drivers/phy/hisilicon/phy-hi3660-usb3.c
  
  USB ISP116X DRIVER
@@@ -18204,6 -18156,14 +18169,14 @@@ L: [email protected]
  S:    Supported
  F:    drivers/usb/class/usblp.c
  
+ USB RAW GADGET DRIVER
+ R:    Andrey Konovalov <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/usb/raw-gadget.rst
+ F:    drivers/usb/gadget/legacy/raw_gadget.c
+ F:    include/uapi/linux/usb/raw_gadget.h
+ 
  USB QMI WWAN NETWORK DRIVER
  M:    Bjørn Mork <[email protected]>
  L:    [email protected]
@@@ -19029,12 -18989,18 +19002,18 @@@ L:        [email protected]
  S:    Maintained
  N:    axp[128]
  
- X.25 NETWORK LAYER
- M:    Andrew Hendry <[email protected]>
+ X.25 STACK
+ M:    Martin Schiller <[email protected]>
  L:    [email protected]
- S:    Odd Fixes
+ S:    Maintained
+ F:    Documentation/networking/lapb-module.rst
  F:    Documentation/networking/x25*
+ F:    drivers/net/wan/hdlc_x25.c
+ F:    drivers/net/wan/lapbether.c
+ F:    include/*/lapb.h
  F:    include/net/x25*
+ F:    include/uapi/linux/x25.h
+ F:    net/lapb/
  F:    net/x25/
  
  X86 ARCHITECTURE (32-BIT AND 64-BIT)
@@@ -19432,13 -19398,6 +19411,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/zonefs.rst
  F:    fs/zonefs/
  
 +ZPOOL COMPRESSED PAGE STORAGE API
 +M:    Dan Streetman <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    include/linux/zpool.h
 +F:    mm/zpool.c
 +
  ZR36067 VIDEO FOR LINUX DRIVER
  M:    Corentin Labbe <[email protected]>
  L:    [email protected]
@@@ -19449,6 -19408,13 +19428,6 @@@ Q:  https://patchwork.linuxtv.org/projec
  F:    Documentation/driver-api/media/drivers/zoran.rst
  F:    drivers/staging/media/zoran/
  
 -ZPOOL COMPRESSED PAGE STORAGE API
 -M:    Dan Streetman <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    include/linux/zpool.h
 -F:    mm/zpool.c
 -
  ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
  M:    Minchan Kim <[email protected]>
  M:    Nitin Gupta <[email protected]>

diff --combined drivers/media/platform/Kconfig
index b161f2ba238fef1b6b3de8d94e0d253b13a3908f,7e152bbb4fa66ef46db0a16048437d97461ce6ad..ffffef2267f4d0de159d956153ec4dc263caeb2f
--- 1/drivers/media/platform/Kconfig
--- 2/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@@ -147,24 -147,6 +147,24 @@@ config VIDEO_RENESAS_CE
        help
          This is a v4l2 driver for the Renesas CEU Interface
  
 +config VIDEO_ROCKCHIP_ISP1
 +      tristate "Rockchip Image Signal Processing v1 Unit driver"
 +      depends on VIDEO_V4L2 && OF
 +      depends on ARCH_ROCKCHIP || COMPILE_TEST
 +      select MEDIA_CONTROLLER
 +      select VIDEO_V4L2_SUBDEV_API
 +      select VIDEOBUF2_DMA_CONTIG
 +      select VIDEOBUF2_VMALLOC
 +      select V4L2_FWNODE
 +      select GENERIC_PHY_MIPI_DPHY
 +      default n
 +      help
 +        Enable this to support the Image Signal Processing (ISP) module
 +        present in RK3399 SoCs.
 +
 +        To compile this driver as a module, choose M here: the module
 +        will be called rockchip-isp1.
 +
  source "drivers/media/platform/exynos4-is/Kconfig"
  source "drivers/media/platform/am437x/Kconfig"
  source "drivers/media/platform/xilinx/Kconfig"
@@@ -271,17 -253,31 +271,31 @@@ config VIDEO_MEDIATEK_VCODE
        depends on MTK_IOMMU || COMPILE_TEST
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_MEDIATEK || COMPILE_TEST
+       depends on VIDEO_MEDIATEK_VPU || MTK_SCP
+       # The two following lines ensure we have the same state ("m" or "y") as
+       # our dependencies, to avoid missing symbols during link.
+       depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU
+       depends on MTK_SCP || !MTK_SCP
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
-       select VIDEO_MEDIATEK_VPU
-       select MTK_SCP
+       select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU
+       select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP
        help
-           Mediatek video codec driver provides HW capability to
-           encode and decode in a range of video formats
-           This driver rely on VPU driver to communicate with VPU.
+         Mediatek video codec driver provides HW capability to
+         encode and decode in a range of video formats on MT8173
+         and MT8183.
+ 
+         Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to
+         also be selected. Support for MT8183 depends on MTK_SCP.
+ 
+         To compile this driver as modules, choose M here: the
+         modules will be called mtk-vcodec-dec and mtk-vcodec-enc.
+ 
+ config VIDEO_MEDIATEK_VCODEC_VPU
+       bool
  
-           To compile this driver as modules, choose M here: the
-           modules will be called mtk-vcodec-dec and mtk-vcodec-enc.
+ config VIDEO_MEDIATEK_VCODEC_SCP
+       bool
  
  config VIDEO_MEM2MEM_DEINTERLACE
        tristate "Deinterlace support"

diff --combined drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
index c7ed09fbafb6ac063e461d99c01bfe20011b467a,145686d2c219c49a39438cfe28525ad2c7aef950..147dfef1638d272716a29e0933fa670e057bde97
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@@ -232,9 -232,16 +232,9 @@@ static int mtk_vcodec_probe(struct plat
                mtk_v4l2_err("Could not get vdec IPI device");
                return -ENODEV;
        }
 -      if (!pdev->dev.dma_parms) {
 -              pdev->dev.dma_parms = devm_kzalloc(&pdev->dev,
 -                                              sizeof(*pdev->dev.dma_parms),
 -                                              GFP_KERNEL);
 -              if (!pdev->dev.dma_parms)
 -                      return -ENOMEM;
 -      }
 -      dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
 +      dma_set_max_seg_size(&pdev->dev, UINT_MAX);
  
-       dev->fw_handler = mtk_vcodec_fw_select(dev, fw_type, VPU_RST_DEC);
+       dev->fw_handler = mtk_vcodec_fw_select(dev, fw_type, DECODER);
        if (IS_ERR(dev->fw_handler))
                return PTR_ERR(dev->fw_handler);
  

diff --combined drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
index a2aa96b03f669f793d4ed47b1c3230f090204154,3be8a04c4c67934f6f4bb1caac06baeffc05d645..dfb42e19bf813921de28eb8c86db06c8a73765e2
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
@@@ -284,9 -284,16 +284,9 @@@ static int mtk_vcodec_probe(struct plat
                mtk_v4l2_err("Could not get venc IPI device");
                return -ENODEV;
        }
 -      if (!pdev->dev.dma_parms) {
 -              pdev->dev.dma_parms = devm_kzalloc(&pdev->dev,
 -                                              sizeof(*pdev->dev.dma_parms),
 -                                              GFP_KERNEL);
 -              if (!pdev->dev.dma_parms)
 -                      return -ENOMEM;
 -      }
 -      dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
 +      dma_set_max_seg_size(&pdev->dev, UINT_MAX);
  
-       dev->fw_handler = mtk_vcodec_fw_select(dev, fw_type, VPU_RST_ENC);
+       dev->fw_handler = mtk_vcodec_fw_select(dev, fw_type, ENCODER);
        if (IS_ERR(dev->fw_handler))
                return PTR_ERR(dev->fw_handler);
  

diff --combined drivers/media/platform/qcom/venus/core.h
index 3bc129a4f817ea09380361950ffac58674148f5a,05c9fbd51f0c057586afbe588541c4a93c9e3487..f03ed427accd1de30397f58d74c52b05ac9b98f6
--- 1/drivers/media/platform/qcom/venus/core.h
--- 2/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@@ -243,8 -243,19 +243,19 @@@ struct venc_controls 
  
        u32 header_mode;
  
-       u32 profile;
-       u32 level;
+       struct {
+               u32 h264;
+               u32 mpeg4;
+               u32 hevc;
+               u32 vp8;
+               u32 vp9;
+       } profile;
+       struct {
+               u32 h264;
+               u32 mpeg4;
+               u32 hevc;
+               u32 vp9;
+       } level;
  };
  
  struct venus_buffer {
@@@ -361,7 -372,6 +372,7 @@@ struct venus_inst 
        unsigned int streamon_cap, streamon_out;
        u32 width;
        u32 height;
 +      struct v4l2_rect crop;
        u32 out_width;
        u32 out_height;
        u32 colorspace;

diff --combined drivers/media/platform/qcom/venus/pm_helpers.c
index 12784e9b1d6690196ee6109512fbe79e721bb3b7,a9538c2cc3c9dcee80b963c83f6c2578e1f9050a..ca99908ca3d394e1b39e15eae17c656fea05bbe3
--- 1/drivers/media/platform/qcom/venus/pm_helpers.c
--- 2/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@@ -212,16 -212,6 +212,16 @@@ static int load_scale_bw(struct venus_c
        }
        mutex_unlock(&core->lock);
  
 +      /*
 +       * keep minimum bandwidth vote for "video-mem" path,
 +       * so that clks can be disabled during vdec_session_release().
 +       * Actual bandwidth drop will be done during device supend
 +       * so that device can power down without any warnings.
 +       */
 +
 +      if (!total_avg && !total_peak)
 +              total_avg = kbps_to_icc(1000);
 +
        dev_dbg(core->dev, VDBGL "total: avg_bw: %u, peak_bw: %u\n",
                total_avg, total_peak);
  
@@@ -804,7 -794,7 +804,7 @@@ skip_pmdomains
        return 0;
  
  opp_dl_add_err:
-       dev_pm_domain_detach(core->opp_pmdomain, true);
+       dev_pm_opp_detach_genpd(core->opp_table);
  opp_attach_err:
        if (core->pd_dl_venus) {
                device_link_del(core->pd_dl_venus);
@@@ -842,7 -832,7 +842,7 @@@ skip_pmdomains
        if (core->opp_dl_venus)
                device_link_del(core->opp_dl_venus);
  
-       dev_pm_domain_detach(core->opp_pmdomain, true);
+       dev_pm_opp_detach_genpd(core->opp_table);
  }
  
  static int core_get_v4(struct device *dev)
@@@ -938,7 -928,7 +938,7 @@@ static unsigned long calculate_inst_fre
        u32 fps = (u32)inst->fps;
        u32 mbs_per_sec;
  
 -      mbs_per_sec = load_per_instance(inst) / fps;
 +      mbs_per_sec = load_per_instance(inst);
  
        vpp_freq = mbs_per_sec * inst->clk_data.codec_freq_data->vpp_freq;
        /* 21 / 20 is overhead factor */

diff --combined drivers/media/platform/qcom/venus/venc.c
index 0bf92cc21f3a97277b0bc86836d3bdf40e97bf53,47246528ac7ef5985a668bcca61e909ae0c69b29..1c61602c5de19c677478000ba06698ff7b5f88ac
--- 1/drivers/media/platform/qcom/venus/venc.c
--- 2/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@@ -537,6 -537,7 +537,7 @@@ static int venc_set_properties(struct v
        struct hfi_quantization quant;
        struct hfi_quantization_range quant_range;
        u32 ptype, rate_control, bitrate;
+       u32 profile, level;
        int ret;
  
        ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2);
@@@ -684,7 -685,35 +685,35 @@@
        if (ret)
                return ret;
  
-       ret = venus_helper_set_profile_level(inst, ctr->profile, ctr->level);
+       switch (inst->hfi_codec) {
+       case HFI_VIDEO_CODEC_H264:
+               profile = ctr->profile.h264;
+               level = ctr->level.h264;
+               break;
+       case HFI_VIDEO_CODEC_MPEG4:
+               profile = ctr->profile.mpeg4;
+               level = ctr->level.mpeg4;
+               break;
+       case HFI_VIDEO_CODEC_VP8:
+               profile = ctr->profile.vp8;
+               level = 0;
+               break;
+       case HFI_VIDEO_CODEC_VP9:
+               profile = ctr->profile.vp9;
+               level = ctr->level.vp9;
+               break;
+       case HFI_VIDEO_CODEC_HEVC:
+               profile = ctr->profile.hevc;
+               level = ctr->level.hevc;
+               break;
+       case HFI_VIDEO_CODEC_MPEG2:
+       default:
+               profile = 0;
+               level = 0;
+               break;
+       }
+ 
+       ret = venus_helper_set_profile_level(inst, profile, level);
        if (ret)
                return ret;
  
@@@ -999,7 -1028,7 +1028,7 @@@ static int m2m_queue_init(void *priv, s
  
  static void venc_inst_init(struct venus_inst *inst)
  {
 -      inst->fmt_cap = &venc_formats[2];
 +      inst->fmt_cap = &venc_formats[3];
        inst->fmt_out = &venc_formats[0];
        inst->width = 1280;
        inst->height = ALIGN(720, 32);