Merge branch 'arm/fixes' into for-next

* arm/fixes: (233 commits)
  ARM: ixp4xx: fix building both pci drivers
  ARM: configs: Update the nhk8815_defconfig
  Linux 5.14-rc5
  Revert "riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED"
  riscv: Get rid of CONFIG_PHYS_RAM_BASE in kernel physical address conversion
  kyber: make trace_block_rq call consistent with documentation
  ext4: fix potential htree corruption when growing large_dir directories
  tracepoint: Use rcu get state and cond sync for static call updates
  io-wq: fix lack of acct->nr_workers < acct->max_workers judgement
  io-wq: fix no lock protection of acct->nr_worker
  perf/x86/intel: Apply mid ACK for small core
  RDMA/iw_cxgb4: Fix refcount underflow while destroying cqs.
  drm/amdgpu: add DID for beige goby
  drm/amdgpu/display: fix DMUB firmware version info
  drm/amd/display: workaround for hard hang on HPD on native DP
  drm/amd/display: Fix resetting DCN3.1 HW when resuming from S4
  drm/amd/display: Increase stutter watermark for dcn303
  drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X
  drm/amd/display: Assume LTTPR interop for DCN31+
  drm/amdgpu: fix checking pmops when PM_SLEEP is not enabled
  ...

diff --cc drivers/spi/spi-imx.c
Simple merge