linux-2.6-block.git
3 years agoMerge branch 'ntb-next' of https://github.com/jonmason/ntb.git
Stephen Rothwell [Thu, 17 Feb 2022 03:59:19 +0000 (14:59 +1100)]
Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git

3 years agoMerge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni...
Stephen Rothwell [Thu, 17 Feb 2022 03:57:01 +0000 (14:57 +1100)]
Merge branch 'rtc-next' of git://git./linux/kernel/git/abelloni/linux.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
Stephen Rothwell [Thu, 17 Feb 2022 03:55:49 +0000 (14:55 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/coresight/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching...
Stephen Rothwell [Thu, 17 Feb 2022 03:55:48 +0000 (14:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/livepatching/livepatching

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux...
Stephen Rothwell [Thu, 17 Feb 2022 03:54:37 +0000 (14:54 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/shuah/linux-kselftest.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
Stephen Rothwell [Thu, 17 Feb 2022 03:52:29 +0000 (14:52 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/thierry.reding/linux-pwm.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl...
Stephen Rothwell [Thu, 17 Feb 2022 03:50:08 +0000 (14:50 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/pinctrl/samsung.git

3 years agoMerge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...
Stephen Rothwell [Thu, 17 Feb 2022 03:50:08 +0000 (14:50 +1100)]
Merge branch 'renesas-pinctrl' of git://git./linux/kernel/git/geert/renesas-drivers.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl...
Stephen Rothwell [Thu, 17 Feb 2022 03:50:07 +0000 (14:50 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/pinctrl/intel.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...
Stephen Rothwell [Thu, 17 Feb 2022 03:50:07 +0000 (14:50 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/linusw/linux-pinctrl.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux...
Stephen Rothwell [Thu, 17 Feb 2022 03:46:31 +0000 (14:46 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/andy/linux-gpio-intel.git

3 years agoMerge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl...
Stephen Rothwell [Thu, 17 Feb 2022 03:46:30 +0000 (14:46 +1100)]
Merge branch 'gpio/for-next' of git://git./linux/kernel/git/brgl/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...
Stephen Rothwell [Thu, 17 Feb 2022 03:44:22 +0000 (14:44 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/remoteproc/linux.git

3 years agoMerge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
Stephen Rothwell [Thu, 17 Feb 2022 03:42:02 +0000 (14:42 +1100)]
Merge branch 'linux-next' of git://git./linux/kernel/git/mst/vhost.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
Stephen Rothwell [Thu, 17 Feb 2022 03:42:02 +0000 (14:42 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/mkp/scsi.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
Stephen Rothwell [Thu, 17 Feb 2022 03:39:21 +0000 (14:39 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/jejb/scsi.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
Stephen Rothwell [Thu, 17 Feb 2022 03:37:13 +0000 (14:37 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/tj/cgroup.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
Stephen Rothwell [Thu, 17 Feb 2022 03:35:05 +0000 (14:35 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/vkoul/dmaengine.git

3 years agoMerge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git
Stephen Rothwell [Thu, 17 Feb 2022 03:33:33 +0000 (14:33 +1100)]
Merge branch 'icc-next' of git://git./linux/kernel/git/djakov/icc.git

3 years agoMerge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
Stephen Rothwell [Thu, 17 Feb 2022 03:17:12 +0000 (14:17 +1100)]
Merge branch 'togreg' of git://git./linux/kernel/git/jic23/iio.git

# Conflicts:
# .mailmap

3 years agoMerge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Stephen Rothwell [Thu, 17 Feb 2022 03:14:46 +0000 (14:14 +1100)]
Merge branch 'staging-next' of git://git./linux/kernel/git/gregkh/staging.git

# Conflicts:
# drivers/staging/fbtft/fbtft.h
# drivers/staging/r8188eu/include/ieee80211.h

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderb...
Stephen Rothwell [Thu, 17 Feb 2022 02:58:12 +0000 (13:58 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/westeri/thunderbolt.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
Stephen Rothwell [Thu, 17 Feb 2022 02:56:39 +0000 (13:56 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/vkoul/soundwire.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
Stephen Rothwell [Thu, 17 Feb 2022 02:54:16 +0000 (13:54 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/phy/linux-phy.git

3 years agoMerge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo...
Stephen Rothwell [Thu, 17 Feb 2022 02:54:15 +0000 (13:54 +1100)]
Merge branch 'extcon-next' of git://git./linux/kernel/git/chanwoo/extcon.git

3 years agoMerge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Stephen Rothwell [Thu, 17 Feb 2022 02:51:52 +0000 (13:51 +1100)]
Merge branch 'char-misc-next' of git://git./linux/kernel/git/gregkh/char-misc.git

3 years agoMerge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
Stephen Rothwell [Thu, 17 Feb 2022 02:49:15 +0000 (13:49 +1100)]
Merge branch 'tty-next' of git://git./linux/kernel/git/gregkh/tty.git

3 years agoMerge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter...
Stephen Rothwell [Thu, 17 Feb 2022 02:49:15 +0000 (13:49 +1100)]
Merge branch 'for-usb-next' of git://git./linux/kernel/git/peter.chen/usb.git

3 years agoMerge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Stephen Rothwell [Thu, 17 Feb 2022 02:47:39 +0000 (13:47 +1100)]
Merge branch 'usb-next' of git://git./linux/kernel/git/gregkh/usb.git

# Conflicts:
# arch/arm64/boot/dts/qcom/ipq6018.dtsi
# arch/arm64/boot/dts/xilinx/zynqmp.dtsi

3 years agoMerge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
Stephen Rothwell [Thu, 17 Feb 2022 02:43:51 +0000 (13:43 +1100)]
Merge branch 'driver-core-next' of git://git./linux/kernel/git/gregkh/driver-core.git

# Conflicts:
# drivers/power/supply/ab8500_chargalg.c

3 years agoMerge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git
Stephen Rothwell [Thu, 17 Feb 2022 02:42:18 +0000 (13:42 +1100)]
Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux...
Stephen Rothwell [Thu, 17 Feb 2022 02:40:47 +0000 (13:40 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/pavel/linux-leds.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platf...
Stephen Rothwell [Thu, 17 Feb 2022 02:39:15 +0000 (13:39 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/chrome-platform/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platfo...
Stephen Rothwell [Thu, 17 Feb 2022 02:37:39 +0000 (13:37 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/pdx86/platform-drivers-x86.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
Stephen Rothwell [Thu, 17 Feb 2022 02:35:30 +0000 (13:35 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/tj/wq.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percp...
Stephen Rothwell [Thu, 17 Feb 2022 02:35:30 +0000 (13:35 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/dennis/percpu.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
Stephen Rothwell [Thu, 17 Feb 2022 02:32:23 +0000 (13:32 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/kvms390/linux.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
Stephen Rothwell [Thu, 17 Feb 2022 02:32:22 +0000 (13:32 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/kvmarm/kvmarm.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git
Stephen Rothwell [Thu, 17 Feb 2022 02:32:22 +0000 (13:32 +1100)]
Merge branch 'next' of git://git./virt/kvm/kvm.git

3 years agoMerge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...
Stephen Rothwell [Thu, 17 Feb 2022 02:15:59 +0000 (13:15 +1100)]
Merge branch 'rcu/next' of git://git./linux/kernel/git/paulmck/linux-rcu.git

3 years agoMerge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
Stephen Rothwell [Thu, 17 Feb 2022 02:07:11 +0000 (13:07 +1100)]
Merge branch 'irq/irqchip-next' of git://git./linux/kernel/git/maz/arm-platforms.git

3 years agoMerge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras...
Stephen Rothwell [Thu, 17 Feb 2022 02:05:38 +0000 (13:05 +1100)]
Merge branch 'edac-for-next' of git://git./linux/kernel/git/ras/ras.git

3 years agoMerge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano...
Stephen Rothwell [Thu, 17 Feb 2022 02:03:29 +0000 (13:03 +1100)]
Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git

3 years agoMerge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
Stephen Rothwell [Thu, 17 Feb 2022 01:47:14 +0000 (12:47 +1100)]
Merge branch 'auto-latest' of git://git./linux/kernel/git/tip/tip.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Thu, 17 Feb 2022 01:44:08 +0000 (12:44 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/broonie/spi.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
Stephen Rothwell [Thu, 17 Feb 2022 01:41:58 +0000 (12:41 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/robh/linux.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
Stephen Rothwell [Thu, 17 Feb 2022 01:39:34 +0000 (12:39 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/joro/iommu.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
Stephen Rothwell [Thu, 17 Feb 2022 01:32:17 +0000 (12:32 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/pcmoore/selinux.git

3 years agoMerge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
Stephen Rothwell [Thu, 17 Feb 2022 01:30:08 +0000 (12:30 +1100)]
Merge branch 'next-integrity' of git://git./linux/kernel/git/zohar/linux-integrity

3 years agoMerge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj...
Stephen Rothwell [Thu, 17 Feb 2022 01:27:57 +0000 (12:27 +1100)]
Merge branch 'apparmor-next' of git://git./linux/kernel/git/jj/linux-apparmor

3 years agoMerge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
Stephen Rothwell [Thu, 17 Feb 2022 01:27:56 +0000 (12:27 +1100)]
Merge branch 'next-testing' of git://git./linux/kernel/git/jmorris/linux-security.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Thu, 17 Feb 2022 01:26:11 +0000 (12:26 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/broonie/regulator.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...
Stephen Rothwell [Thu, 17 Feb 2022 01:23:34 +0000 (12:23 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/sre/linux-power-supply.git

3 years agoMerge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...
Stephen Rothwell [Thu, 17 Feb 2022 01:22:23 +0000 (12:22 +1100)]
Merge branch 'for-mfd-next' of git://git./linux/kernel/git/lee/mfd.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
Stephen Rothwell [Thu, 17 Feb 2022 01:20:49 +0000 (12:20 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/ulfh/mmc.git

3 years agoMerge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...
Stephen Rothwell [Thu, 17 Feb 2022 01:19:14 +0000 (12:19 +1100)]
Merge branch 'pcmcia-next' of git://git./linux/kernel/git/brodo/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...
Stephen Rothwell [Thu, 17 Feb 2022 01:17:25 +0000 (12:17 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/dlemoal/libata.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mappe...
Stephen Rothwell [Thu, 17 Feb 2022 01:15:06 +0000 (12:15 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/device-mapper/linux-dm.git

3 years agoMerge branch 'for-next' of git://git.kernel.dk/linux-block.git
Stephen Rothwell [Thu, 17 Feb 2022 01:04:36 +0000 (12:04 +1100)]
Merge branch 'for-next' of git://git.kernel.dk/linux-block.git

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

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
Stephen Rothwell [Thu, 17 Feb 2022 01:03:03 +0000 (12:03 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/dtor/input.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Thu, 17 Feb 2022 01:01:15 +0000 (12:01 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/broonie/sound.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
Stephen Rothwell [Thu, 17 Feb 2022 00:58:10 +0000 (11:58 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/tiwai/sound.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Thu, 17 Feb 2022 00:56:02 +0000 (11:56 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/broonie/regmap.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux...
Stephen Rothwell [Thu, 17 Feb 2022 00:54:27 +0000 (11:54 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/deller/linux-fbdev.git

3 years agoMerge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux
Stephen Rothwell [Thu, 17 Feb 2022 00:52:55 +0000 (11:52 +1100)]
Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux

3 years agoMerge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git
Stephen Rothwell [Thu, 17 Feb 2022 00:52:55 +0000 (11:52 +1100)]
Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git

3 years agonext-20220214/drm-intel
Stephen Rothwell [Thu, 17 Feb 2022 00:49:59 +0000 (11:49 +1100)]
next-20220214/drm-intel

3 years agoMerge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
Stephen Rothwell [Thu, 17 Feb 2022 00:31:50 +0000 (11:31 +1100)]
Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux

3 years agoMerge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git
Stephen Rothwell [Thu, 17 Feb 2022 00:31:48 +0000 (11:31 +1100)]
Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto...
Stephen Rothwell [Thu, 17 Feb 2022 00:29:27 +0000 (11:29 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/herbert/cryptodev-2.6.git

3 years agoMerge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Stephen Rothwell [Thu, 17 Feb 2022 00:27:04 +0000 (11:27 +1100)]
Merge branch 'nand/next' of git://git./linux/kernel/git/mtd/linux.git

3 years agoMerge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Stephen Rothwell [Thu, 17 Feb 2022 00:24:41 +0000 (11:24 +1100)]
Merge branch 'mtd/next' of git://git./linux/kernel/git/mtd/linux.git

3 years agoMerge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless...
Stephen Rothwell [Thu, 17 Feb 2022 00:08:14 +0000 (11:08 +1100)]
Merge branch 'main' of git git://git./linux/kernel/git/wireless/wireless-next.git

# Conflicts:
# net/mac80211/mlme.c

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
Stephen Rothwell [Thu, 17 Feb 2022 00:04:14 +0000 (11:04 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth-next.git

3 years agoMerge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...
Stephen Rothwell [Thu, 17 Feb 2022 00:04:14 +0000 (11:04 +1100)]
Merge branch 'mlx5-next' of git://git./linux/kernel/git/mellanox/linux.git

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
Stephen Rothwell [Thu, 17 Feb 2022 00:04:13 +0000 (11:04 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf...
Stephen Rothwell [Thu, 17 Feb 2022 00:04:13 +0000 (11:04 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/bpf/bpf-next.git

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net...
Stephen Rothwell [Thu, 17 Feb 2022 00:04:11 +0000 (11:04 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/netdev/net-next.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
Stephen Rothwell [Thu, 17 Feb 2022 00:02:25 +0000 (11:02 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/rdma/rdma.git

3 years agoMerge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viresh...
Stephen Rothwell [Thu, 17 Feb 2022 00:00:18 +0000 (11:00 +1100)]
Merge branch 'opp/linux-next' of git://git./linux/kernel/git/vireshk/pm.git

3 years agoMerge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel...
Stephen Rothwell [Wed, 16 Feb 2022 23:57:55 +0000 (10:57 +1100)]
Merge branch 'cpufreq/arm/linux-next' of git://git./linux/kernel/git/vireshk/pm.git

3 years agoMerge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
Stephen Rothwell [Wed, 16 Feb 2022 23:43:02 +0000 (10:43 +1100)]
Merge branch 'linux-next' of git://git./linux/kernel/git/rafael/linux-pm.git

3 years agoMerge branch 'master' of git://linuxtv.org/mchehab/media-next.git
Stephen Rothwell [Wed, 16 Feb 2022 23:41:30 +0000 (10:41 +1100)]
Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git

3 years agoMerge branch 'master' of git://linuxtv.org/media_tree.git
Stephen Rothwell [Wed, 16 Feb 2022 23:39:08 +0000 (10:39 +1100)]
Merge branch 'master' of git://linuxtv.org/media_tree.git

3 years agoMerge branch 'docs-next' of git://git.lwn.net/linux.git
Stephen Rothwell [Wed, 16 Feb 2022 23:37:58 +0000 (10:37 +1100)]
Merge branch 'docs-next' of git://git.lwn.net/linux.git

3 years agoMerge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
Stephen Rothwell [Wed, 16 Feb 2022 23:36:24 +0000 (10:36 +1100)]
Merge branch 'hwmon-next' of git://git./linux/kernel/git/groeck/linux-staging.git

3 years agoMerge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
Stephen Rothwell [Wed, 16 Feb 2022 23:21:53 +0000 (10:21 +1100)]
Merge branch 'i2c/for-next' of git://git./linux/kernel/git/wsa/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
Stephen Rothwell [Wed, 16 Feb 2022 23:20:18 +0000 (10:20 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/hid/hid.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git
Stephen Rothwell [Wed, 16 Feb 2022 23:18:10 +0000 (10:18 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/printk/linux.git

3 years agobpftool: Fix pretty print dump for maps without BTF loaded
Jiri Olsa [Wed, 16 Feb 2022 09:21:02 +0000 (10:21 +0100)]
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
3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
Stephen Rothwell [Wed, 16 Feb 2022 23:02:00 +0000 (10:02 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/viro/vfs.git

# Conflicts:
# arch/x86/um/Kconfig

3 years agoMerge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...
Stephen Rothwell [Wed, 16 Feb 2022 22:59:55 +0000 (09:59 +1100)]
Merge branch 'locks-next' of git://git./linux/kernel/git/jlayton/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...
Stephen Rothwell [Wed, 16 Feb 2022 22:59:55 +0000 (09:59 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/dlemoal/zonefs.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
Stephen Rothwell [Wed, 16 Feb 2022 22:59:54 +0000 (09:59 +1100)]
Merge branch 'for-next' of git://git./fs/xfs/xfs-linux.git

3 years agoMerge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git
Stephen Rothwell [Wed, 16 Feb 2022 22:59:54 +0000 (09:59 +1100)]
Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Stephen Rothwell [Wed, 16 Feb 2022 22:59:53 +0000 (09:59 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/cel/linux

3 years agoMerge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git
Stephen Rothwell [Wed, 16 Feb 2022 22:59:53 +0000 (09:59 +1100)]
Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git

3 years agoMerge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git
Stephen Rothwell [Wed, 16 Feb 2022 22:59:53 +0000 (09:59 +1100)]
Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux...
Stephen Rothwell [Wed, 16 Feb 2022 22:59:52 +0000 (09:59 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/gfs2/linux-gfs2.git

3 years agoMerge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
Stephen Rothwell [Wed, 16 Feb 2022 22:59:52 +0000 (09:59 +1100)]
Merge branch 'dev' of git://git./linux/kernel/git/jaegeuk/f2fs.git