]>
www.infradead.org Git - users/jedix/linux-maple.git/log
Stephen Rothwell [Wed, 14 Apr 2021 03:43:19 +0000 (13:43 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 03:40:32 +0000 (13:40 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 03:37:40 +0000 (13:37 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 03:36:02 +0000 (13:36 +1000)]
Merge remote-tracking branch 'etnaviv/etnaviv/next'
Stephen Rothwell [Wed, 14 Apr 2021 03:34:43 +0000 (13:34 +1000)]
Merge remote-tracking branch 'imx-drm/imx-drm/next'
# Conflicts:
# drivers/gpu/drm/imx/ipuv3-plane.c
Stephen Rothwell [Wed, 14 Apr 2021 03:33:05 +0000 (13:33 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 03:31:35 +0000 (13:31 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
# Conflicts:
# drivers/gpu/drm/i915/display/vlv_dsi.c
Stephen Rothwell [Wed, 14 Apr 2021 03:30:04 +0000 (13:30 +1000)]
Merge remote-tracking branch 'amdgpu/drm-next'
Stephen Rothwell [Wed, 14 Apr 2021 03:15:11 +0000 (13:15 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 14 Apr 2021 03:12:33 +0000 (13:12 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 14 Apr 2021 03:10:55 +0000 (13:10 +1000)]
Merge remote-tracking branch 'spi-nor/spi-nor/next'
Stephen Rothwell [Wed, 14 Apr 2021 03:09:17 +0000 (13:09 +1000)]
Merge remote-tracking branch 'nand/nand/next'
Stephen Rothwell [Wed, 14 Apr 2021 03:07:03 +0000 (13:07 +1000)]
Merge remote-tracking branch 'mtd/mtd/next'
Stephen Rothwell [Wed, 14 Apr 2021 03:05:44 +0000 (13:05 +1000)]
Merge remote-tracking branch 'gfs2/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 03:02:59 +0000 (13:02 +1000)]
Merge remote-tracking branch 'mac80211-next/master'
Stephen Rothwell [Wed, 14 Apr 2021 03:01:20 +0000 (13:01 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 14 Apr 2021 02:54:17 +0000 (12:54 +1000)]
Merge remote-tracking branch 'netfilter-next/master'
Stephen Rothwell [Wed, 14 Apr 2021 02:52:34 +0000 (12:52 +1000)]
Merge remote-tracking branch 'mlx5-next/mlx5-next'
Stephen Rothwell [Wed, 14 Apr 2021 02:51:15 +0000 (12:51 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Wed, 14 Apr 2021 02:42:15 +0000 (12:42 +1000)]
Merge remote-tracking branch 'bpf-next/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 02:27:23 +0000 (12:27 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 14 Apr 2021 02:22:10 +0000 (12:22 +1000)]
Merge remote-tracking branch 'rdma/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 02:19:56 +0000 (12:19 +1000)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Wed, 14 Apr 2021 02:18:38 +0000 (12:18 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 14 Apr 2021 02:16:47 +0000 (12:16 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 02:14:33 +0000 (12:14 +1000)]
Merge remote-tracking branch 'thermal/thermal/linux-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:59:57 +0000 (11:59 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:57:29 +0000 (11:57 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
# Conflicts:
# MAINTAINERS
Stephen Rothwell [Wed, 14 Apr 2021 01:55:41 +0000 (11:55 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:54:01 +0000 (11:54 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:52:11 +0000 (11:52 +1000)]
Merge remote-tracking branch 'dmi/dmi-for-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:50:52 +0000 (11:50 +1000)]
Merge remote-tracking branch 'i3c/i3c/next'
Stephen Rothwell [Wed, 14 Apr 2021 01:46:22 +0000 (11:46 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:44:39 +0000 (11:44 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:43:21 +0000 (11:43 +1000)]
Merge remote-tracking branch 'pstore/for-next/pstore'
Stephen Rothwell [Wed, 14 Apr 2021 01:38:18 +0000 (11:38 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 14 Apr 2021 01:36:08 +0000 (11:36 +1000)]
Merge remote-tracking branch 'printk/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:22:24 +0000 (11:22 +1000)]
Merge remote-tracking branch 'vfs/for-next'
# Conflicts:
# fs/btrfs/ioctl.c
# fs/overlayfs/file.c
# fs/xfs/xfs_ioctl.c
Stephen Rothwell [Wed, 14 Apr 2021 01:20:37 +0000 (11:20 +1000)]
Merge remote-tracking branch 'file-locks/locks-next'
Toke Høiland-Jørgensen [Tue, 13 Apr 2021 09:16:07 +0000 (11:16 +0200)]
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
Toke Høiland-Jørgensen [Tue, 13 Apr 2021 09:16:06 +0000 (11:16 +0200)]
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
Stephen Rothwell [Wed, 14 Apr 2021 01:18:49 +0000 (11:18 +1000)]
Merge remote-tracking branch 'iomap/iomap-for-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:17:23 +0000 (11:17 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:16:05 +0000 (11:16 +1000)]
Merge remote-tracking branch 'v9fs/9p-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:14:46 +0000 (11:14 +1000)]
Merge remote-tracking branch 'overlayfs/overlayfs-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:12:32 +0000 (11:12 +1000)]
Merge remote-tracking branch 'cel/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:11:13 +0000 (11:11 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:09:55 +0000 (11:09 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 01:07:46 +0000 (11:07 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 14 Apr 2021 01:06:07 +0000 (11:06 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 14 Apr 2021 00:51:34 +0000 (10:51 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 14 Apr 2021 00:50:15 +0000 (10:50 +1000)]
Merge remote-tracking branch 'exfat/dev'
Stephen Rothwell [Wed, 14 Apr 2021 00:48:36 +0000 (10:48 +1000)]
Merge remote-tracking branch 'erofs/dev'
Stephen Rothwell [Wed, 14 Apr 2021 00:47:18 +0000 (10:47 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 14 Apr 2021 00:45:39 +0000 (10:45 +1000)]
Merge remote-tracking branch 'cifsd/cifsd-for-next'
Stephen Rothwell [Wed, 14 Apr 2021 00:44:19 +0000 (10:44 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 00:36:27 +0000 (10:36 +1000)]
Merge remote-tracking branch 'btrfs/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 00:22:43 +0000 (10:22 +1000)]
Merge remote-tracking branch 'fscache/fscache-next'
Stephen Rothwell [Wed, 14 Apr 2021 00:10:24 +0000 (10:10 +1000)]
Merge remote-tracking branch 'pidfd/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 00:09:25 +0000 (10:09 +1000)]
Merge remote-tracking branch 'xtensa/xtensa-for-next'
Stephen Rothwell [Wed, 14 Apr 2021 00:08:25 +0000 (10:08 +1000)]
Merge remote-tracking branch 'sh/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 00:07:25 +0000 (10:07 +1000)]
Merge remote-tracking branch 's390/for-next'
Stephen Rothwell [Wed, 14 Apr 2021 00:06:24 +0000 (10:06 +1000)]
Merge remote-tracking branch 'risc-v/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:53:26 +0000 (09:53 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 13 Apr 2021 23:52:26 +0000 (09:52 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:50:39 +0000 (09:50 +1000)]
Merge remote-tracking branch 'mips/mips-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:49:39 +0000 (09:49 +1000)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 13 Apr 2021 23:49:39 +0000 (09:49 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:48:39 +0000 (09:48 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:46:48 +0000 (09:46 +1000)]
Merge remote-tracking branch 'h8300/h8300-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:45:48 +0000 (09:45 +1000)]
Merge remote-tracking branch 'csky/linux-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:43:39 +0000 (09:43 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:31 +0000 (09:41 +1000)]
Merge remote-tracking branch 'ti-k3/ti-k3-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:27 +0000 (09:41 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:26 +0000 (09:41 +1000)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:24 +0000 (09:41 +1000)]
Merge remote-tracking branch 'scmi/for-linux-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:22 +0000 (09:41 +1000)]
Merge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:21 +0000 (09:41 +1000)]
Merge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:21 +0000 (09:41 +1000)]
Merge remote-tracking branch 'reset/reset/next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:19 +0000 (09:41 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:19 +0000 (09:41 +1000)]
Merge remote-tracking branch 'realtek/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:18 +0000 (09:41 +1000)]
Merge remote-tracking branch 'raspberrypi/for-next'
# Conflicts:
# arch/arm/boot/dts/bcm2711.dtsi
Stephen Rothwell [Tue, 13 Apr 2021 23:41:13 +0000 (09:41 +1000)]
Merge remote-tracking branch 'qcom/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:08 +0000 (09:41 +1000)]
Merge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:07 +0000 (09:41 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:06 +0000 (09:41 +1000)]
Merge remote-tracking branch 'mediatek/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:05 +0000 (09:41 +1000)]
Merge remote-tracking branch 'keystone/next'
Stephen Rothwell [Tue, 13 Apr 2021 23:41:00 +0000 (09:41 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:40:59 +0000 (09:40 +1000)]
Merge remote-tracking branch 'drivers-memory/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:40:56 +0000 (09:40 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:40:55 +0000 (09:40 +1000)]
Merge remote-tracking branch 'aspeed/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:40:54 +0000 (09:40 +1000)]
Merge remote-tracking branch 'amlogic/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:40:53 +0000 (09:40 +1000)]
Merge remote-tracking branch 'actions/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:27:41 +0000 (09:27 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:14:34 +0000 (09:14 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'
# Conflicts:
# arch/arm64/include/asm/cpucaps.h
Stephen Rothwell [Tue, 13 Apr 2021 23:11:45 +0000 (09:11 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 23:11:44 +0000 (09:11 +1000)]
Merge remote-tracking branch 'asm-generic/master'
Matthew Gerlach [Tue, 13 Apr 2021 22:58:35 +0000 (15:58 -0700)]
hwmon: (intel-m10-bmc-hwmon) add sensor support of Intel D5005 card
Like the Intel N3000 card, the Intel D5005 has a MAX10 based
BMC. This commit adds support for the D5005 sensors that are
monitored by the MAX10 BMC.
Signed-off-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
Signed-off-by: Russ Weight <russell.h.weight@linux.intel.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20210413225835.459662-3-matthew.gerlach@linux.intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Stephen Rothwell [Tue, 13 Apr 2021 23:02:06 +0000 (09:02 +1000)]
Merge remote-tracking branch 'dma-mapping/for-next'
Stephen Rothwell [Tue, 13 Apr 2021 22:57:57 +0000 (08:57 +1000)]
Merge remote-tracking branch 'kbuild/for-next'