Merge remote-tracking branch 'scsi-mkp/for-next'

# Conflicts:
# drivers/target/iscsi/iscsi_target.c

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

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

Merge remote-tracking branch 'dmaengine/next'

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

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

Merge remote-tracking branch 'vfio/next'

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

Merge remote-tracking branch 'char-misc/char-misc-next'

# Conflicts:
# drivers/phy/qualcomm/phy-qcom-qmp.c

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

Merge remote-tracking branch 'usb-serial/usb-next'

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

Merge remote-tracking branch 'driver-core/driver-core-next'

# Conflicts:
# drivers/of/property.c

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

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

Merge remote-tracking branch 'chrome-platform/for-next'

Merge remote-tracking branch 'drivers-x86/for-next'

# Conflicts:
# MAINTAINERS
# drivers/platform/x86/thinkpad_acpi.c

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

Merge remote-tracking branch 'kvms390/next'

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

Merge remote-tracking branch 'kvm/next'

# Conflicts:
# arch/x86/kvm/svm/nested.c

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

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

# Conflicts:
# arch/x86/kernel/kprobes/ftrace.c

Merge remote-tracking branch 'irqchip/irq/irqchip-next'

# Conflicts:
# drivers/irqchip/Kconfig
# drivers/irqchip/Makefile

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

Merge remote-tracking branch 'tip/auto-latest'

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

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

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

# Conflicts:
# drivers/of/of_net.c

Merge remote-tracking branch 'audit/next'

Merge remote-tracking branch 'iommu/next'

Merge remote-tracking branch 'tpmdd/next'

Merge remote-tracking branch 'tomoyo/master'

Merge remote-tracking branch 'selinux/next'

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

# Conflicts:
# certs/system_keyring.c

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

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

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

# Conflicts:
# arch/alpha/kernel/syscalls/syscall.tbl
# arch/arm/tools/syscall.tbl
# arch/arm64/include/asm/unistd.h
# arch/arm64/include/asm/unistd32.h
# arch/ia64/kernel/syscalls/syscall.tbl
# arch/m68k/kernel/syscalls/syscall.tbl
# arch/microblaze/kernel/syscalls/syscall.tbl
# arch/mips/kernel/syscalls/syscall_n32.tbl
# arch/mips/kernel/syscalls/syscall_n64.tbl
# arch/mips/kernel/syscalls/syscall_o32.tbl
# arch/parisc/kernel/syscalls/syscall.tbl
# arch/powerpc/kernel/syscalls/syscall.tbl
# arch/s390/kernel/syscalls/syscall.tbl
# arch/sh/kernel/syscalls/syscall.tbl
# arch/sparc/kernel/syscalls/syscall.tbl
# arch/x86/entry/syscalls/syscall_32.tbl
# arch/x86/entry/syscalls/syscall_64.tbl
# arch/xtensa/kernel/syscalls/syscall.tbl
# include/uapi/asm-generic/unistd.h

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

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

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

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

Merge remote-tracking branch 'mmc/next'

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

Merge remote-tracking branch 'device-mapper/for-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 'sound-asoc/for-next'

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

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

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

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

# Conflicts:
# drivers/gpu/drm/imx/ipuv3-plane.c

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

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

# Conflicts:
# drivers/gpu/drm/i915/display/vlv_dsi.c

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

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

Merge remote-tracking branch 'crypto/master'

Merge remote-tracking branch 'spi-nor/spi-nor/next'

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

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

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

Merge remote-tracking branch 'mac80211-next/master'

Merge remote-tracking branch 'bluetooth/master'

Merge remote-tracking branch 'netfilter-next/master'

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

Merge remote-tracking branch 'ipsec-next/master'

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

Merge remote-tracking branch 'net-next/master'

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

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

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 'pm/linux-next'

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

# Conflicts:
# MAINTAINERS

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

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

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

Merge remote-tracking branch 'i3c/i3c/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'

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

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

# Conflicts:
# fs/btrfs/ioctl.c
# fs/overlayfs/file.c
# fs/xfs/xfs_ioctl.c

Merge remote-tracking branch 'file-locks/locks-next'

selftests/bpf: Add tests for target information in bpf_link info queries

Extend the fexit_bpf2bpf test to check that the info for the bpf_link
returned by the kernel matches the expected values.

While we're updating the test, change existing uses of CHEC() to use the
much easier to read ASSERT_*() macros.

v2:
- Convert last CHECK() call and get rid of 'duration' var
- Split ASSERT_OK_PTR() checks to two separate if statements

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210413091607.58945-2-toke@redhat.com

bpf: Return target info when a tracing bpf_link is queried

There is currently no way to discover the target of a tracing program
attachment after the fact. Add this information to bpf_link_info and return
it when querying the bpf_link fd.

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210413091607.58945-1-toke@redhat.com

Merge remote-tracking branch 'iomap/iomap-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 'cel/for-next'

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

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

Merge remote-tracking branch 'f2fs/dev'

mailbox: arm_mhu_db: Remove redundant dev_err call in mhu_db_probe()

There is a error message within devm_ioremap_resource
already, so remove the dev_err call to avoid redundant
error message.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Qiheng Lin <linqiheng@huawei.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>

mailbox: sprd: Add supplementary inbox support

Some sensors connected to Unisoc mailbox will send data very frequently.
This makes channel 0 very busy and the messages from other remote cores
not able to be handled as soon as possible.

It's a trick (un-documented) from Unisoc ASIC designers to resolve this
special requirement that an inbox assigned to one of the remote cores
before was modified to be exposed to host cpu core.

Then from host side, a supplementary inbox is added for transferring mass
but not emergency messages from the remote cores, such as step counting
sensor, with an independent FIFO and interrupt which is as same as channel
0. Meanwihle, inbox part of this channel is still kept for original remote
core to use.

Signed-off-by: Orson Zhai <orson.zhai@unisoc.com>
Reviewed-by: Baolin Wang <baolin.wang7@gmail.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>

dt-bindings: mailbox: Add interrupt-names to SPRD mailbox

We add an optional supp-outbox interrupt support to SPRD mailbox driver
with newly added sc9863a support and change to configure interrupts with
names in device tree files.

Signed-off-by: Orson Zhai <orson.zhai@unisoc.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>