Merge branch 'for-next' of git://git./linux/kernel/git/device-mapper/linux-dm.git

Merge branch 'for-next' of git://git.kernel.dk/linux-block.git

# Conflicts:
# fs/iomap/direct-io.c

Merge branch 'next' of git://git./linux/kernel/git/dtor/input.git

Merge branch 'for-next' of git://git./linux/kernel/git/broonie/sound.git

Merge branch 'for-next' of git://git./linux/kernel/git/tiwai/sound.git

Merge branch 'for-next' of git://git./linux/kernel/git/broonie/regmap.git

Merge branch 'for-next' of git://git./linux/kernel/git/deller/linux-fbdev.git

Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux

Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git

next-20220214/drm-intel

Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux

Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git

Merge branch 'master' of git://git./linux/kernel/git/herbert/cryptodev-2.6.git

Merge branch 'nand/next' of git://git./linux/kernel/git/mtd/linux.git

Merge branch 'mtd/next' of git://git./linux/kernel/git/mtd/linux.git

Merge branch 'main' of git git://git./linux/kernel/git/wireless/wireless-next.git

# Conflicts:
# net/mac80211/mlme.c

Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth-next.git

Merge branch 'mlx5-next' of git://git./linux/kernel/git/mellanox/linux.git

Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next.git

Merge branch 'for-next' of git://git./linux/kernel/git/bpf/bpf-next.git

Merge branch 'master' of git://git./linux/kernel/git/netdev/net-next.git

Merge branch 'for-next' of git://git./linux/kernel/git/rdma/rdma.git

Merge branch 'opp/linux-next' of git://git./linux/kernel/git/vireshk/pm.git

Merge branch 'cpufreq/arm/linux-next' of git://git./linux/kernel/git/vireshk/pm.git

Merge branch 'linux-next' of git://git./linux/kernel/git/rafael/linux-pm.git

Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git

Merge branch 'master' of git://linuxtv.org/media_tree.git

Merge branch 'docs-next' of git://git.lwn.net/linux.git

Merge branch 'hwmon-next' of git://git./linux/kernel/git/groeck/linux-staging.git

Merge branch 'i2c/for-next' of git://git./linux/kernel/git/wsa/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/hid/hid.git

Merge branch 'for-next' of git://git./linux/kernel/git/printk/linux.git

bpftool: Fix pretty print dump for maps without BTF loaded

The commit e5043894b21f ("bpftool: Use libbpf_get_error() to check error")
fails to dump map without BTF loaded in pretty mode (-p option).

Fixing this by making sure get_map_kv_btf won't fail in case there's
no BTF available for the map.

Fixes: e5043894b21f ("bpftool: Use libbpf_get_error() to check error")
Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220216092102.125448-1-jolsa@kernel.org

Merge branch 'for-next' of git://git./linux/kernel/git/viro/vfs.git

# Conflicts:
# arch/x86/um/Kconfig

Merge branch 'locks-next' of git://git./linux/kernel/git/jlayton/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/dlemoal/zonefs.git

Merge branch 'for-next' of git://git./fs/xfs/xfs-linux.git

Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git

Merge branch 'for-next' of git://git./linux/kernel/git/cel/linux

Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git

Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git

Merge branch 'for-next' of git://git./linux/kernel/git/gfs2/linux-gfs2.git

Merge branch 'dev' of git://git./linux/kernel/git/jaegeuk/f2fs.git

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git

Merge branch 'for-next' of git://git./linux/kernel/git/kdave/linux.git

Merge branch 'master' of git://git./fs/fscrypt/fscrypt.git

Merge branch 'for-next' of git://git./linux/kernel/git/brauner/linux.git

Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git

Merge branch 'for-next' of git://git./linux/kernel/git/s390/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/riscv/linux.git

Merge branch 'next' of git://git./linux/kernel/git/leo/linux.git

Merge branch 'next' of git://git./linux/kernel/git/powerpc/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/deller/parisc-linux.git

Merge branch 'for-next' of git://github.com/openrisc/linux.git

Merge branch 'next' of git://git./linux/kernel/git/greentime/linux.git

# Conflicts:
# arch/nds32/Kbuild
# arch/nds32/Kconfig

Merge branch 'mips-next' of git://git./linux/kernel/git/mips/linux.git

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git

Merge branch 'for-next' of git://git./linux/kernel/git/gerg/m68knommu.git

Merge branch 'for-next' of git://git./linux/kernel/git/geert/linux-m68k.git

Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git

Merge branch 'renesas-clk' of git://git./linux/kernel/git/geert/renesas-drivers.git

Merge branch 'for-next' of git://git./linux/kernel/git/abelvesa/linux.git

Merge branch 'clk-next' of git://git./linux/kernel/git/clk/linux.git

Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git

Merge branch 'ti-next' of git://git./linux/kernel/git/ti/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/tegra/linux.git

Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git

Merge branch 'sunxi/for-next' of git://git./linux/kernel/git/sunxi/linux.git

Merge branch 'stm32-next' of git://git./linux/kernel/git/atorgue/stm32.git

Merge branch 'for-linux-next' of git://git./linux/kernel/git/sudeep.holla/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/krzk/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/mmind/linux-rockchip.git

Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux

Merge branch 'next' of git://git./linux/kernel/git/geert/renesas-devel.git

Merge branch 'for-next' of git://git./linux/kernel/git/nsaenz/linux-rpi.git

Merge branch 'for-next' of git://git./linux/kernel/git/qcom/linux.git

# Conflicts:
# arch/arm64/configs/defconfig

Merge branch 'for-next' of git://git./linux/kernel/git/tmlind/linux-omap.git

Merge branch 'for-next' of git://git./linux/kernel/git/gclement/mvebu.git

Merge branch 'for-next' of git://git./linux/kernel/git/matthias.bgg/linux.git

Merge branch 'next' of git://git./linux/kernel/git/ssantosh/linux-keystone.git

Merge branch 'for-next' of git://git./linux/kernel/git/shawnguo/linux.git

Merge branch 'for-next' of https://git./linux/kernel/git/krzk/linux-mem-ctrl.git

Merge branch 'at91-next' of git://git./linux/kernel/git/at91/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/joel/bmc.git

Merge branch 'for-next' of git://git./linux/kernel/git/amlogic/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/mani/linux-actions.git

Merge branch 'for-next/core' of git://git./linux/kernel/git/arm64/linux

Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git

# Conflicts:
# arch/arm/Kconfig

Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git

Merge branch 'perf/core' of git://git./linux/kernel/git/acme/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/masahiroy/linux-kbuild.git

Merge branch 'for-next/kspp' of git://git./linux/kernel/git/gustavoars/linux.git

drm/amdgpu/smu11.5: restore cclks in vangogh_set_performance_level

When we disable manual clock setting, we need to restore the cclks
as well as the gfxclk.

Acked-by: Huang Rui <ray.huang@amd.com>
Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

drm/radeon: Add HD-audio component notifier support (v2)

This patch adds the support for the notification of HD-audio hotplug
via the already existing drm_audio_component framework to radeon
driver.  This allows us more reliable hotplug notification and ELD
transfer without accessing HD-audio bus; it's more efficient, and more
importantly, it works without waking up the runtime PM.

The implementation is rather simplistic: radeon driver provides the
get_eld ops for HD-audio, and it notifies the audio hotplug via
pin_eld_notify callback upon each radeon_audio_enable() call.
The pin->id is referred as the port number passed to the notifier
callback, and the corresponding connector is looked through the
encoder list in the get_eld callback in turn.

The bind and unbind callbacks handle the device-link so that it
assures the PM call order.

v2: fix the logic in radeon_audio_component_get_eld to walk the
connector list since that is where the EDID lives and we can
derive the encoder from the connector because the encoder has
not been assigned at this point (i.e., during monitor probe).

Acked-by: Jim Qu <Jim.Qu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Revert "drm/amd/display: To modify the condition in indicating branch device"

This breaks HDMI audio.

This reverts commit 9413b23fadad3861f5afd626ac44ef83ad8068ab.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1536
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Martin Tsai <martin.tsai@amd.com>
Cc: Bindu Ramamurthy <bindu.r@amd.com>

drm/amdgpu/swsmu/vgh: rename MSG_RlcPowerNotify

To match the new definition: MSG_RlcPowerDownNotify.  We only
need to tell the SMU when we turn off the RLC; when it powers
up it already handshakes with SMU.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

drm/amdgpu: only check for _PR3 on dGPUs

We don't support runtime pm on APUs.  They support more
dynamic power savings using clock and powergating.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

drm/amdgpu: add another raven1 gfxoff quirk

HP Elite Disk 705 G4 Micro seems to have issues with gfxoff.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=207899
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

drm/amdgpu/gfx10: Add GC 10.3.7 Support

Needed to properly initialize GC 10.3.7.

Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

drm/amdkfd: Replace zero-length array with flexible-array member

Reference:
https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays

CC: Changcheng Deng <deng.changcheng@zte.com.cn>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Philip Yang <Philip.Yang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>