linux-2.6-block.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

3 years agoMerge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git
Stephen Rothwell [Wed, 16 Feb 2022 22:59:51 +0000 (09:59 +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 [Wed, 16 Feb 2022 22:59:51 +0000 (09:59 +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 [Wed, 16 Feb 2022 22:59:50 +0000 (09:59 +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 [Wed, 16 Feb 2022 22:59:50 +0000 (09:59 +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 [Wed, 16 Feb 2022 22:43:45 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:44 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:44 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:44 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:43 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:43 +0000 (09:43 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/deller/parisc-linux.git

3 years agoMerge branch 'for-next' of git://github.com/openrisc/linux.git
Stephen Rothwell [Wed, 16 Feb 2022 22:43:43 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:42 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:41 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:41 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:41 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:41 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:40 +0000 (09:43 +1100)]
Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git

3 years agoMerge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...
Stephen Rothwell [Wed, 16 Feb 2022 22:43:40 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:39 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:39 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:39 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:39 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:38 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:38 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:38 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:38 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:37 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:37 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:37 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:36 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:36 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:36 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:35 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:35 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:34 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:34 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:34 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:33 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:33 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:31 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:31 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:31 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:30 +0000 (09:43 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/mani/linux-actions.git

3 years agoMerge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
Stephen Rothwell [Wed, 16 Feb 2022 22:43:30 +0000 (09:43 +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 [Wed, 16 Feb 2022 22:43:30 +0000 (09:43 +1100)]
Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git

# Conflicts:
# arch/arm/Kconfig

3 years agoMerge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git
Stephen Rothwell [Wed, 16 Feb 2022 22:41:24 +0000 (09:41 +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 [Wed, 16 Feb 2022 22:40:13 +0000 (09:40 +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 [Wed, 16 Feb 2022 22:39:01 +0000 (09:39 +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 [Wed, 16 Feb 2022 22:33:55 +0000 (09:33 +1100)]
Merge branch 'for-next/kspp' of git://git./linux/kernel/git/gustavoars/linux.git

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

3 years agoMerge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc
Stephen Rothwell [Wed, 16 Feb 2022 22:04:49 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:49 +0000 (09:04 +1100)]
Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git

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

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:48 +0000 (09:04 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/rw/ubifs.git

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:47 +0000 (09:04 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/pinctrl/intel.git

3 years agoMerge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:47 +0000 (09:04 +1100)]
Merge branch 'gpio/for-current' of git://git./linux/kernel/git/brgl/linux.git

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:47 +0000 (09:04 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/riscv/linux.git

3 years agoMerge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:46 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:46 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:46 +0000 (09:04 +1100)]
Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:45 +0000 (09:04 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/mkp/scsi.git

3 years agoMerge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:45 +0000 (09:04 +1100)]
Merge branch 'dt/linus' of git://git./linux/kernel/git/robh/linux.git

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:45 +0000 (09:04 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/pdx86/platform-drivers-x86.git

3 years agoMerge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:44 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:44 +0000 (09:04 +1100)]
Merge branch 'hwmon' of git://git./linux/kernel/git/groeck/linux-staging.git

3 years agoMerge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:44 +0000 (09:04 +1100)]
Merge branch 'at91-fixes' of git://git./linux/kernel/git/at91/linux.git

3 years agoMerge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:43 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:43 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:43 +0000 (09:04 +1100)]
Merge branch 'mtd/fixes' of git://git./linux/kernel/git/mtd/linux.git

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:42 +0000 (09:04 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/vkoul/dmaengine.git

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:42 +0000 (09:04 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/shuah/linux-kselftest.git

3 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:42 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:41 +0000 (09:04 +1100)]
Merge branch 'fixes-togreg' of git://git./linux/kernel/git/jic23/iio.git

3 years agoMerge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:41 +0000 (09:04 +1100)]
Merge branch 'staging-linus' of git://git./linux/kernel/git/gregkh/staging.git

3 years agoMerge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:41 +0000 (09:04 +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 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:40 +0000 (09:04 +1100)]
Merge branch 'usb-linus' of git://git./linux/kernel/git/gregkh/usb.git

3 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:40 +0000 (09:04 +1100)]
Merge branch 'for-linus' of git://git./linux/kernel/git/helgaas/pci.git

3 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Wed, 16 Feb 2022 22:04:39 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:39 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:39 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:39 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:38 +0000 (09:04 +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/klassert/ipsec.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:38 +0000 (09:04 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec.git

3 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:38 +0000 (09:04 +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 [Wed, 16 Feb 2022 22:04:37 +0000 (09:04 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/netdev/net.git

3 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:37 +0000 (09:04 +1100)]
Merge branch 'fixes' of git://git./linux/kernel/git/powerpc/linux.git

3 years agoMerge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:37 +0000 (09:04 +1100)]
Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git

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

3 years agoMerge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
Stephen Rothwell [Wed, 16 Feb 2022 22:04:36 +0000 (09:04 +1100)]
Merge branch 'for-curr' of git://git./linux/kernel/git/vgupta/arc.git

3 years agoparisc: Always use the self-extracting kernel feature
Helge Deller [Tue, 15 Feb 2022 19:56:27 +0000 (20:56 +0100)]
parisc: Always use the self-extracting kernel feature

This patch drops the CONFIG_PARISC_SELF_EXTRACT option.

The palo boot loader is able to decompress a kernel which was compressed
with gzip. That possibility was useful when the Linux kernel
self-extracting feature wasn't implemented yet.

Beside the fact that the self-extracting feature offers much better
compression rates, we do support self-extracting kernels already since
kernel v4.14, so now it's really time to get rid of that old option and
always use the self-extractor.

Signed-off-by: Helge Deller <deller@gmx.de>
3 years agovideo/fbdev/stifb: Implement the stifb_fillrect() function
Helge Deller [Thu, 13 Jan 2022 15:35:53 +0000 (16:35 +0100)]
video/fbdev/stifb: Implement the stifb_fillrect() function

The stifb driver (for Artist/HCRX graphics on PA-RISC) was missing
the fillrect function.
Tested on a 715/64 PA-RISC machine and in qemu.

Signed-off-by: Helge Deller <deller@gmx.de>
3 years agoparisc: Add vDSO support
Helge Deller [Wed, 8 Dec 2021 10:06:52 +0000 (11:06 +0100)]
parisc: Add vDSO support

Add minimal vDSO support, which provides the signal trampoline helpers,
but none of the userspace syscall helpers like time wrappers.

The big benefit of this vDSO implementation is, that we now don't need
an executeable stack any longer. PA-RISC is one of the last
architectures where an executeable stack was needed in oder to implement
the signal trampolines by putting assembly instructions on the stack
which then gets executed. Instead the kernel will provide the relevant
code in the vDSO page and only put the pointers to the signal
information on the stack.

By dropping the need for executable stacks we avoid running into issues
with applications which want non executable stacks for security reasons.
Additionally, alternative stacks on memory areas without exec
permissions are supported too.

This code is based on an initial implementation by Randolph Chung from 2006:
https://lore.kernel.org/linux-parisc/4544A34A.6080700@tausq.org/

I did the porting and lifted the code to current code base. Dave fixed
the unwind code so that gdb and glibc are able to backtrace through the
code. An additional patch to gdb will be pushed upstream by Dave.

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Dave Anglin <dave.anglin@bell.net>
Cc: Randolph Chung <randolph@tausq.org>
3 years agobpf: Fix crash due to out of bounds access into reg2btf_ids.
Kumar Kartikeya Dwivedi [Wed, 16 Feb 2022 20:19:43 +0000 (01:49 +0530)]
bpf: Fix crash due to out of bounds access into reg2btf_ids.

When commit e6ac2450d6de ("bpf: Support bpf program calling kernel function") added
kfunc support, it defined reg2btf_ids as a cheap way to translate the verifier
reg type to the appropriate btf_vmlinux BTF ID, however
commit c25b2ae13603 ("bpf: Replace PTR_TO_XXX_OR_NULL with PTR_TO_XXX | PTR_MAYBE_NULL")
moved the __BPF_REG_TYPE_MAX from the last member of bpf_reg_type enum to after
the base register types, and defined other variants using type flag
composition. However, now, the direct usage of reg->type to index into
reg2btf_ids may no longer fall into __BPF_REG_TYPE_MAX range, and hence lead to
out of bounds access and kernel crash on dereference of bad pointer.

Fixes: c25b2ae13603 ("bpf: Replace PTR_TO_XXX_OR_NULL with PTR_TO_XXX | PTR_MAYBE_NULL")
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220216201943.624869-1-memxor@gmail.com