Merge remote-tracking branch 'apparmor/apparmor-next'

Merge remote-tracking branch 'security/next-testing'

Merge remote-tracking branch 'backlight/for-backlight-next'

Merge remote-tracking branch 'mfd/for-mfd-next'

Merge remote-tracking branch 'block/for-next'

Merge remote-tracking branch 'input/next'

Merge remote-tracking branch 'modules/modules-next'

Merge remote-tracking branch 'imx-drm/imx-drm/next'

Merge remote-tracking branch 'amdgpu/drm-next'

# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c

Merge remote-tracking branch 'drm-misc/for-linux-next'

Merge remote-tracking branch 'nand/nand/next'

Merge remote-tracking branch 'mtd/mtd/next'

Merge remote-tracking branch 'bluetooth/master'

Merge remote-tracking branch 'rdma/for-next'

Merge remote-tracking branch 'swiotlb/linux-next'

# Conflicts:
# kernel/dma/direct.c

Merge remote-tracking branch 'dlm/next'

Merge remote-tracking branch 'ieee1394/for-next'

Merge remote-tracking branch 'thermal/thermal/linux-next'

Merge remote-tracking branch 'cpupower/cpupower'

Merge remote-tracking branch 'pm/linux-next'

Merge remote-tracking branch 'v4l-dvb-next/master'

Merge remote-tracking branch 'jc_docs/docs-next'

Merge remote-tracking branch 'i2c/i2c/for-next'

Merge remote-tracking branch 'hid/for-next'

Merge remote-tracking branch 'pstore/for-next/pstore'

Merge remote-tracking branch 'pci/next'

# Conflicts:
# MAINTAINERS
# drivers/net/ethernet/broadcom/bnx2.c
# drivers/net/ethernet/broadcom/bnxt/bnxt.c

Merge remote-tracking branch 'printk/for-next'

# Conflicts:
# MAINTAINERS

Merge remote-tracking branch 'vfs/for-next'

Merge remote-tracking branch 'zonefs/for-next'

Merge remote-tracking branch 'xfs/for-next'

Merge remote-tracking branch 'v9fs/9p-next'

Merge remote-tracking branch 'overlayfs/overlayfs-next'

Merge remote-tracking branch 'ntfs3/master'

Merge remote-tracking branch 'cel/for-next'

Merge remote-tracking branch 'nfs-anna/linux-next'

Merge remote-tracking branch 'fuse/for-next'

Merge remote-tracking branch 'f2fs/dev'

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'ext3/for_next'

Merge remote-tracking branch 'erofs/dev'

Merge remote-tracking branch 'configfs/for-next'

Merge remote-tracking branch 'btrfs/for-next'

Merge remote-tracking branch 'fscache/fscache-next'

Merge remote-tracking branch 'pidfd/for-next'

Merge remote-tracking branch 'xtensa/xtensa-for-next'

Merge remote-tracking branch 'uml/linux-next'

Merge remote-tracking branch 'sh/for-next'

Merge remote-tracking branch 's390/for-next'

Merge remote-tracking branch 'risc-v/for-next'

Merge remote-tracking branch 'powerpc/next'

# Conflicts:
# arch/powerpc/sysdev/xive/common.c

Merge remote-tracking branch 'parisc-hd/for-next'

Merge remote-tracking branch 'openrisc/for-next'

Merge remote-tracking branch 'mips/mips-next'

Merge remote-tracking branch 'microblaze/next'

Merge remote-tracking branch 'm68knommu/for-next'

Merge remote-tracking branch 'h8300/h8300-next'

Merge remote-tracking branch 'clk/clk-next'

Merge remote-tracking branch 'xilinx/for-next'

Merge remote-tracking branch 'ti-k3/ti-k3-next'

Merge remote-tracking branch 'tegra/for-next'

Merge remote-tracking branch 'sunxi/sunxi/for-next'

Merge remote-tracking branch 'scmi/for-linux-next'

Merge remote-tracking branch 'samsung-krzk/for-next'

Merge remote-tracking branch 'rockchip/for-next'

Merge remote-tracking branch 'renesas/next'

Merge remote-tracking branch 'raspberrypi/for-next'

Merge remote-tracking branch 'qcom/for-next'

Merge remote-tracking branch 'omap/for-next'

Merge remote-tracking branch 'mvebu/for-next'

Merge remote-tracking branch 'mediatek/for-next'

Merge remote-tracking branch 'keystone/next'

Merge remote-tracking branch 'imx-mxs/for-next'

Merge remote-tracking branch 'at91/at91-next'

Merge remote-tracking branch 'aspeed/for-next'

Merge remote-tracking branch 'amlogic/for-next'

Merge remote-tracking branch 'actions/for-next'

Merge remote-tracking branch 'arm-soc/for-next'

# Conflicts:
# arch/arm64/boot/dts/qcom/sc7280-idp.dts
# arch/arm64/boot/dts/qcom/sc7280.dtsi
# drivers/firmware/Makefile
# include/uapi/linux/virtio_ids.h

Merge remote-tracking branch 'arm64/for-next/core'

Merge remote-tracking branch 'arm/for-next'

Merge remote-tracking branch 'arc/for-next'

Merge remote-tracking branch 'asm-generic/master'

# Conflicts:
# include/asm-generic/bitops/non-atomic.h

Merge remote-tracking branch 'dma-mapping/for-next'

Merge remote-tracking branch 'compiler-attributes/compiler-attributes'

# Conflicts:
# include/linux/compiler_attributes.h

Merge remote-tracking branch 'kbuild/for-next'

Merge remote-tracking branch 'kspp-gustavo/for-next/kspp'

Merge remote-tracking branch 'fpga-fixes/fixes'

Merge remote-tracking branch 'rtc-fixes/rtc-fixes'

Merge remote-tracking branch 'vfs-fixes/fixes'

Merge remote-tracking branch 'btrfs-fixes/next-fixes'

Merge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'

Merge remote-tracking branch 'omap-fixes/fixes'

Merge remote-tracking branch 'iio-fixes/fixes-togreg'

Merge remote-tracking branch 'usb-serial-fixes/usb-linus'

Merge remote-tracking branch 'regulator-fixes/for-linus'

Merge remote-tracking branch 'sound-asoc-fixes/for-linus'

Merge remote-tracking branch 'sound-current/for-linus'

Merge remote-tracking branch 'netfilter/master'

Merge remote-tracking branch 'net/master'

Merge branches 'clk-kirkwood', 'clk-imx', 'clk-doc', 'clk-zynq' and 'clk-ralink' into clk-next

* clk-kirkwood:
  clk: kirkwood: Fix a clocking boot regression

* clk-imx:
  clk: imx8mn: Add M7 core clock
  clk: imx8m: fix clock tree update of TF-A managed clocks
  clk: imx: clk-divider-gate: Switch to clk_divider.determine_rate
  clk: imx8mn: use correct mux type for clkout path
  clk: imx8mm: use correct mux type for clkout path

* clk-doc:
  dt-bindings: clock: samsung: fix header path in example
  MAINTAINERS: clock: include S3C and S5P in Samsung SoC clock entry
  dt-bindings: clock: samsung: convert S5Pv210 AudSS to dtschema
  dt-bindings: clock: samsung: convert Exynos AudSS to dtschema
  dt-bindings: clock: samsung: convert Exynos4 to dtschema
  dt-bindings: clock: samsung: convert Exynos3250 to dtschema
  dt-bindings: clock: samsung: convert Exynos542x to dtschema
  dt-bindings: clock: samsung: add bindings for Exynos external clock
  dt-bindings: clock: samsung: convert Exynos5250 to dtschema
  dt-bindings: clock: brcm,iproc-clocks: fix armpll properties
  clk: zynqmp: Fix kernel-doc format
  clk: at91: sama7g5: remove all kernel-doc & kernel-doc warnings
  clk: zynqmp: fix kernel doc

* clk-zynq:
  clk: zynqmp: Fix a memory leak
  clk: zynqmp: Check the return type

* clk-ralink:
  clk: ralink: avoid to set 'CLK_IS_CRITICAL' flag for gates

Merge branches 'clk-nvidia', 'clk-rockchip', 'clk-at91' and 'clk-vc5' into clk-next

 - Support the SD/OE pin on IDT VersaClock 5 and 6 clock generators

* clk-nvidia:
  clk: tegra: fix old-style declaration
  clk: tegra: Remove CLK_IS_CRITICAL flag from fuse clock
  soc/tegra: fuse: Enable fuse clock on suspend for Tegra124
  soc/tegra: fuse: Add runtime PM support
  soc/tegra: fuse: Clear fuse->clk on driver probe failure
  soc/tegra: pmc: Prevent racing with cpuilde driver
  soc/tegra: bpmp: Remove unused including <linux/version.h>

* clk-rockchip:
  clk: rockchip: make rk3308 ddrphy4x clock critical
  clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types
  dt-bindings: clk: Convert rockchip,rk3399-cru to DT schema
  clk: rockchip: Add support for hclk_sfc on rk3036
  clk: rockchip: rk3036: fix up the sclk_sfc parent error
  clk: rockchip: add dt-binding clkid for hclk_sfc on rk3036

* clk-at91:
  clk: at91: clk-generated: Limit the requested rate to our range

* clk-vc5:
  clk: vc5: Add properties for configuring SD/OE behavior
  clk: vc5: Use dev_err_probe
  dt-bindings: clk: vc5: Add properties for configuring the SD/OE pin