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'

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'ext3/for_next'

Merge remote-tracking branch 'exfat/dev'

Merge remote-tracking branch 'erofs/dev'

Merge remote-tracking branch 'ecryptfs/next'

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

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

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

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

Merge remote-tracking branch 'powerpc/next'

Merge remote-tracking branch 'parisc-hd/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 'm68k/for-next'

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

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

Merge remote-tracking branch 'clk/clk-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 'reset/reset/next'

Merge remote-tracking branch 'renesas/next'