linux-2.6-block.git
3 years agoMerge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:18 +0000 (10:14 +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 [Mon, 28 Feb 2022 23:14:17 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/gfs2/linux-gfs2.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
Stephen Rothwell [Mon, 28 Feb 2022 23:14:17 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/mszeredi/fuse.git

3 years agoMerge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:16 +0000 (10:14 +1100)]
Merge branch 'dev' of git://git./linux/kernel/git/jaegeuk/f2fs.git

3 years agoMerge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:16 +0000 (10:14 +1100)]
Merge branch 'dev' of git://git./linux/kernel/git/tytso/ext4.git

3 years agoMerge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
Stephen Rothwell [Mon, 28 Feb 2022 23:14:16 +0000 (10:14 +1100)]
Merge branch 'for_next' of git://git./linux/kernel/git/jack/linux-fs.git

3 years agoMerge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:15 +0000 (10:14 +1100)]
Merge branch 'dev' of git://git./linux/kernel/git/xiang/erofs.git

3 years agoMerge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:15 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git

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

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:14 +0000 (10:14 +1100)]
Merge branch 'master' of git://git./fs/fscrypt/fscrypt.git

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

3 years agoMerge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:46 +0000 (09:57 +1100)]
Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:45 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/s390/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:45 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/riscv/linux.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:44 +0000 (09:57 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/leo/linux.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:44 +0000 (09:57 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/powerpc/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/paris...
Stephen Rothwell [Mon, 28 Feb 2022 22:57:44 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/deller/parisc-linux.git

# Conflicts:
# arch/parisc/lib/memcpy.c

3 years agoMerge branch 'for-next' of git://github.com/openrisc/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:43 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://github.com/openrisc/linux.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:43 +0000 (09:57 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/greentime/linux.git

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

3 years agoMerge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:42 +0000 (09:57 +1100)]
Merge branch 'mips-next' of git://git./linux/kernel/git/mips/linux.git

3 years agoMerge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:41 +0000 (09:57 +1100)]
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knom...
Stephen Rothwell [Mon, 28 Feb 2022 22:57:41 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/gerg/m68knommu.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
Stephen Rothwell [Mon, 28 Feb 2022 22:57:41 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/geert/linux-m68k.git

3 years agoMerge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:40 +0000 (09:57 +1100)]
Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git

# Conflicts:
# arch/h8300/mm/memory.c

3 years agoMerge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:37 +0000 (09:55 +1100)]
Merge branch 'renesas-clk' 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/abelvesa...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:37 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/abelvesa/linux.git

3 years agoMerge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:37 +0000 (09:55 +1100)]
Merge branch 'clk-next' of git://git./linux/kernel/git/clk/linux.git

3 years agoMerge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:36 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git

3 years agoMerge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:36 +0000 (09:55 +1100)]
Merge branch 'ti-next' of git://git./linux/kernel/git/ti/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:33 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/tegra/linux.git

3 years agoMerge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:33 +0000 (09:55 +1100)]
Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git

3 years agoMerge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:33 +0000 (09:55 +1100)]
Merge branch 'sunxi/for-next' of git://git./linux/kernel/git/sunxi/linux.git

3 years agoMerge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:32 +0000 (09:55 +1100)]
Merge branch 'stm32-next' of git://git./linux/kernel/git/atorgue/stm32.git

3 years agoMerge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:30 +0000 (09:55 +1100)]
Merge branch 'for-linux-next' of git://git./linux/kernel/git/sudeep.holla/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:26 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/krzk/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:23 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/mmind/linux-rockchip.git

3 years agoMerge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux
Stephen Rothwell [Mon, 28 Feb 2022 22:55:23 +0000 (09:55 +1100)]
Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:20 +0000 (09:55 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/geert/renesas-devel.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:20 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/nsaenz/linux-rpi.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:20 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/qcom/linux.git

# Conflicts:
# arch/arm64/configs/defconfig

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:19 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/tmlind/linux-omap.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:19 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/gclement/mvebu.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:19 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/matthias.bgg/linux.git

3 years agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:18 +0000 (09:55 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/ssantosh/linux-keystone.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:15 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/shawnguo/linux.git

3 years agoMerge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:14 +0000 (09:55 +1100)]
Merge branch 'for-next' of https://git./linux/kernel/git/krzk/linux-mem-ctrl.git

3 years agoMerge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:13 +0000 (09:55 +1100)]
Merge branch 'at91-next' of git://git./linux/kernel/git/at91/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:13 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/joel/bmc.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:12 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/amlogic/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:12 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/mani/linux-actions.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:12 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/soc/soc.git

# Conflicts:
# arch/arm/Kconfig

3 years agoMerge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
Stephen Rothwell [Mon, 28 Feb 2022 22:55:11 +0000 (09:55 +1100)]
Merge branch 'for-next/core' of git://git./linux/kernel/git/arm64/linux

3 years agoMerge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:10 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-gener...
Stephen Rothwell [Mon, 28 Feb 2022 22:40:36 +0000 (09:40 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/arnd/asm-generic.git

3 years agoMerge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git
Stephen Rothwell [Mon, 28 Feb 2022 22:38:28 +0000 (09:38 +1100)]
Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git

3 years agoMerge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:37:16 +0000 (09:37 +1100)]
Merge branch 'perf/core' of git://git./linux/kernel/git/acme/linux.git

3 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...
Stephen Rothwell [Mon, 28 Feb 2022 22:36:02 +0000 (09:36 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/masahiroy/linux-kbuild.git

3 years agoMerge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavo...
Stephen Rothwell [Mon, 28 Feb 2022 22:30:52 +0000 (09:30 +1100)]
Merge branch 'for-next/kspp' of git://git./linux/kernel/git/gustavoars/linux.git

3 years agonext-20220228/kspp
Stephen Rothwell [Mon, 28 Feb 2022 22:23:10 +0000 (09:23 +1100)]
next-20220228/kspp

3 years agoMerge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc
Stephen Rothwell [Mon, 28 Feb 2022 21:47:19 +0000 (08:47 +1100)]
Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc

3 years agoMerge branch 'zstd-linus' of https://github.com/terrelln/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:19 +0000 (08:47 +1100)]
Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:18 +0000 (08:47 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/rw/ubifs.git

3 years agoMerge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni...
Stephen Rothwell [Mon, 28 Feb 2022 21:47:17 +0000 (08:47 +1100)]
Merge branch 'rtc-fixes' of git://git./linux/kernel/git/abelloni/linux.git

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:17 +0000 (08:47 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/ulfh/mmc.git

3 years agoMerge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel
Stephen Rothwell [Mon, 28 Feb 2022 21:47:16 +0000 (08:47 +1100)]
Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel

3 years agoMerge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:16 +0000 (08:47 +1100)]
Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git

3 years agoMerge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
Stephen Rothwell [Mon, 28 Feb 2022 21:47:15 +0000 (08:47 +1100)]
Merge branch 'next-fixes' of git://git./linux/kernel/git/kdave/linux.git

3 years agoMerge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux...
Stephen Rothwell [Mon, 28 Feb 2022 21:47:15 +0000 (08:47 +1100)]
Merge branch 'hwmon' of git://git./linux/kernel/git/groeck/linux-staging.git

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:15 +0000 (08:47 +1100)]
Merge branch 'master' of git://git./virt/kvm/kvm.git

3 years agoMerge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:15 +0000 (08:47 +1100)]
Merge branch 'mips-fixes' of git://git./linux/kernel/git/mips/linux.git

3 years agoMerge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:14 +0000 (08:47 +1100)]
Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git

3 years agoMerge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:14 +0000 (08:47 +1100)]
Merge branch 'mtd/fixes' of git://git./linux/kernel/git/mtd/linux.git

3 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:13 +0000 (08:47 +1100)]
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input.git

3 years agoMerge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...
Stephen Rothwell [Mon, 28 Feb 2022 21:47:13 +0000 (08:47 +1100)]
Merge branch 'fixes-togreg' of git://git./linux/kernel/git/jic23/iio.git

3 years agoMerge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter...
Stephen Rothwell [Mon, 28 Feb 2022 21:47:13 +0000 (08:47 +1100)]
Merge branch 'for-usb-fixes' of git://git./linux/kernel/git/peter.chen/usb.git

# Conflicts:
# drivers/usb/chipidea/ci_hdrc_imx.c

3 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Mon, 28 Feb 2022 21:47:11 +0000 (08:47 +1100)]
Merge branch 'for-linus' of git://git./linux/kernel/git/broonie/spi.git

3 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Mon, 28 Feb 2022 21:47:11 +0000 (08:47 +1100)]
Merge branch 'for-linus' of git://git./linux/kernel/git/broonie/regulator.git

3 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Mon, 28 Feb 2022 21:47:11 +0000 (08:47 +1100)]
Merge branch 'for-linus' of git://git./linux/kernel/git/broonie/sound.git

3 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:11 +0000 (08:47 +1100)]
Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound.git

3 years agoMerge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless...
Stephen Rothwell [Mon, 28 Feb 2022 21:47:10 +0000 (08:47 +1100)]
Merge branch 'main' of git git://git./linux/kernel/git/wireless/wireless.git

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:10 +0000 (08:47 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/bpf/bpf.git

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:10 +0000 (08:47 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/netdev/net.git

3 years agoMerge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:09 +0000 (08:47 +1100)]
Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git

3 years agoMerge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git
Stephen Rothwell [Mon, 28 Feb 2022 21:47:09 +0000 (08:47 +1100)]
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git

3 years agoMerge tag 'soc-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Linus Torvalds [Mon, 28 Feb 2022 20:51:14 +0000 (12:51 -0800)]
Merge tag 'soc-fixes-5.17-2' of git://git./linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "The code changes address mostly minor problems:

   - Several NXP/FSL SoC driver fixes, addressing issues with error
     handling and compilation

   - Fix a clock disabling imbalance in gpcv2 driver.

   - Arm Juno DMA coherency issue

   - Trivial firmware driver fixes for op-tee and scmi firmware

  The remaining changes address issues in the devicetree files:

   - A timer regression for the OMAP devkit8000, which has to use the
     alternative timer.

   - A hang in the i.MX8MM power domain configuration

   - Multiple fixes for the Rockchip RK3399 addressing issues with sound
     and eMMC

   - Cosmetic fixes for i.MX8ULP, RK3xxx, and Tegra124"

* tag 'soc-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (32 commits)
  ARM: tegra: Move panels to AUX bus
  soc: imx: gpcv2: Fix clock disabling imbalance in error path
  soc: fsl: qe: Check of ioremap return value
  soc: fsl: qe: fix typo in a comment
  soc: fsl: guts: Add a missing memory allocation failure check
  soc: fsl: guts: Revert commit 3c0d64e867ed
  soc: fsl: Correct MAINTAINERS database (SOC)
  soc: fsl: Correct MAINTAINERS database (QUICC ENGINE LIBRARY)
  soc: fsl: Replace kernel.h with the necessary inclusions
  dt-bindings: fsl,layerscape-dcfg: add missing compatible for lx2160a
  dt-bindings: qoriq-clock: add missing compatible for lx2160a
  ARM: dts: Use 32KiHz oscillator on devkit8000
  ARM: dts: switch timer config to common devkit8000 devicetree
  tee: optee: fix error return code in probe function
  arm64: dts: imx8ulp: Set #thermal-sensor-cells to 1 as required
  arm64: dts: imx8mm: Fix VPU Hanging
  ARM: dts: rockchip: fix a typo on rk3288 crypto-controller
  ARM: dts: rockchip: reorder rk322x hmdi clocks
  firmware: arm_scmi: Remove space in MODULE_ALIAS name
  arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg"
  ...

3 years agoMerge tag 'efi-urgent-for-v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Mon, 28 Feb 2022 20:44:33 +0000 (12:44 -0800)]
Merge tag 'efi-urgent-for-v5.17-2' of git://git./linux/kernel/git/efi/efi

Pull EFI fixes from Ard Biesheuvel:

 - don't treat valid hartid U32_MAX as a failure return code (RISC-V)

 - avoid blocking query_variable_info() call when blocking is not
   allowed

* tag 'efi-urgent-for-v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efivars: Respect "block" flag in efivar_entry_set_safe()
  riscv/efi_stub: Fix get_boot_hartid_from_fdt() return value

3 years agodrm/arm: arm hdlcd select DRM_GEM_CMA_HELPER
Carsten Haitzler [Mon, 24 Jan 2022 16:24:37 +0000 (16:24 +0000)]
drm/arm: arm hdlcd select DRM_GEM_CMA_HELPER

Without DRM_GEM_CMA_HELPER HDLCD won't build. This needs to be there too.

Fixes: 09717af7d13d ("drm: Remove CONFIG_DRM_KMS_CMA_HELPER option")
Reviewed-by: Steven Price <steven.price@arm.com>
Signed-off-by: Carsten Haitzler <carsten.haitzler@arm.com>
Acked-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220124162437.2470344-1-carsten.haitzler@foss.arm.com
3 years agoiio: adc: xilinx-ams: Fix single channel switching sequence
Robert Hancock [Thu, 27 Jan 2022 17:34:50 +0000 (11:34 -0600)]
iio: adc: xilinx-ams: Fix single channel switching sequence

Some of the AMS channels need to be read by switching into single-channel
mode from the normal polling sequence. There was a logic issue in this
switching code that could cause the first read of these channels to read
back as zero.

It appears that the sequencer should be set back to default mode before
changing the channel selection, and the channel should be set before
switching the sequencer back into single-channel mode.

Also, write 1 to the EOC bit in the status register to clear it before
waiting for it to become set, so that we actually wait for a new
conversion to complete, and don't proceed based on a previous conversion
completing.

Fixes: d5c70627a794 ("iio: adc: Add Xilinx AMS driver")
Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/20220127173450.3684318-5-robert.hancock@calian.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
3 years agoiio: adc: xilinx-ams: Fixed wrong sequencer register settings
Robert Hancock [Thu, 27 Jan 2022 17:34:49 +0000 (11:34 -0600)]
iio: adc: xilinx-ams: Fixed wrong sequencer register settings

Register settings used for the sequencer configuration register
were incorrect, causing some inputs to not be read properly.

Fixes: d5c70627a794 ("iio: adc: Add Xilinx AMS driver")
Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Reviewed-by: Michael Tretter <m.tretter@pengutronix.de>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/20220127173450.3684318-4-robert.hancock@calian.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
3 years agoiio: adc: xilinx-ams: Fixed missing PS channels
Robert Hancock [Thu, 27 Jan 2022 17:34:48 +0000 (11:34 -0600)]
iio: adc: xilinx-ams: Fixed missing PS channels

The code forgot to increment num_channels for the PS channel inputs,
resulting in them not being enabled as they should.

Fixes: d5c70627a794 ("iio: adc: Add Xilinx AMS driver")
Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Reviewed-by: Michael Tretter <m.tretter@pengutronix.de>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/20220127173450.3684318-3-robert.hancock@calian.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
3 years agodt-bindings: iio: adc: zynqmp_ams: Add clock entry
Robert Hancock [Thu, 27 Jan 2022 17:34:47 +0000 (11:34 -0600)]
dt-bindings: iio: adc: zynqmp_ams: Add clock entry

The AMS driver DT binding was missing the clock entry, which is actually
mandatory according to the driver implementation. Add this in.

Fixes: 39dd2d1e251d ("dt-bindings: iio: adc: Add Xilinx AMS binding documentation")
Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/20220127173450.3684318-2-robert.hancock@calian.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
3 years agodrm/bridge: ti-sn65dsi86: Properly undo autosuspend
Douglas Anderson [Tue, 22 Feb 2022 22:18:43 +0000 (14:18 -0800)]
drm/bridge: ti-sn65dsi86: Properly undo autosuspend

The PM Runtime docs say:
  Drivers in ->remove() callback should undo the runtime PM changes done
  in ->probe(). Usually this means calling pm_runtime_disable(),
  pm_runtime_dont_use_autosuspend() etc.

We weren't doing that for autosuspend. Let's do it.

Fixes: 9bede63127c6 ("drm/bridge: ti-sn65dsi86: Use pm_runtime autosuspend")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220222141838.1.If784ba19e875e8ded4ec4931601ce6d255845245@changeid
3 years agoMerge branch 'mvebu/arm' into mvebu/for-next
Gregory CLEMENT [Mon, 28 Feb 2022 16:44:20 +0000 (17:44 +0100)]
Merge branch 'mvebu/arm' into mvebu/for-next

3 years agoarm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias
Pali Rohár [Mon, 17 Jan 2022 18:20:06 +0000 (19:20 +0100)]
arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias

U-Boot uses ethernet* aliases for setting MAC addresses. Therefore define
also alias for ethernet0.

Fixes: 7109d817db2e ("arm64: dts: marvell: add DTS for Turris Mox")
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
3 years agoMerge branch 'for-next-next-v5.17-20220228' into for-next-20220228
David Sterba [Mon, 28 Feb 2022 16:02:26 +0000 (17:02 +0100)]
Merge branch 'for-next-next-v5.17-20220228' into for-next-20220228

3 years agoMerge branch 'for-next-current-v5.16-20220228' into for-next-20220228
David Sterba [Mon, 28 Feb 2022 16:02:26 +0000 (17:02 +0100)]
Merge branch 'for-next-current-v5.16-20220228' into for-next-20220228

3 years agoMerge branch 'dev/setget-speedup-only-first-patch' into for-next-next-v5.17-20220228
David Sterba [Mon, 28 Feb 2022 16:02:25 +0000 (17:02 +0100)]
Merge branch 'dev/setget-speedup-only-first-patch' into for-next-next-v5.17-20220228

3 years agoMerge branch 'ext/qu/scrub-refactor' into for-next-next-v5.17-20220228
David Sterba [Mon, 28 Feb 2022 16:02:25 +0000 (17:02 +0100)]
Merge branch 'ext/qu/scrub-refactor' into for-next-next-v5.17-20220228

3 years agoMerge branch 'ext/qu/subpage-more-sizes' into for-next-next-v5.17-20220228
David Sterba [Mon, 28 Feb 2022 16:02:25 +0000 (17:02 +0100)]
Merge branch 'ext/qu/subpage-more-sizes' into for-next-next-v5.17-20220228

3 years agoMerge branch 'ext/naohiro/zoned-write' into for-next-next-v5.17-20220228
David Sterba [Mon, 28 Feb 2022 16:02:25 +0000 (17:02 +0100)]
Merge branch 'ext/naohiro/zoned-write' into for-next-next-v5.17-20220228