Merge branch 'rcu/next' of git://git./linux/kernel/git/paulmck/linux-rcu.git

Merge branch 'edac-for-next' of git://git./linux/kernel/git/ras/ras.git

Merge branch 'auto-latest' of git://git./linux/kernel/git/tip/tip.git

Merge branch 'for-next' of git://git./linux/kernel/git/robh/linux.git

# Conflicts:
# Documentation/devicetree/bindings/vendor-prefixes.yaml

Merge branch 'apparmor-next' of git://git./linux/kernel/git/jj/linux-apparmor

Merge branch 'next-testing' of git://git./linux/kernel/git/jmorris/linux-security.git

Merge branch 'for-next' of git://git./linux/kernel/git/dlemoal/libata.git

Merge branch 'for-next' of git://git.kernel.dk/linux-block.git

Merge branch 'for-next' of git://git./linux/kernel/git/deller/linux-fbdev.git

Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux

Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel

Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux

Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth-next.git

Merge branch 'cpupower' of git://git./linux/kernel/git/shuah/linux.git

Merge branch 'linux-next' of git://git./linux/kernel/git/rafael/linux-pm.git

Merge branch 'docs-next' of git://git.lwn.net/linux.git

Merge branch 'i2c/for-next' of git://git./linux/kernel/git/wsa/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/hid/hid.git

Merge branch 'for-next' of git://git./linux/kernel/git/printk/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/viro/vfs.git

Merge branch 'locks-next' of git://git./linux/kernel/git/jlayton/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/dlemoal/zonefs.git

Merge branch 'for-next' of git://git./fs/xfs/xfs-linux.git

# Conflicts:
# fs/xfs/xfs_ioctl.c

scripts/dtc: dtx_diff: remove broken example from help text

dtx_diff suggests to use <(...) syntax to pipe two inputs into it, but
this has never worked: The /proc/self/fds/... paths passed by the shell
will fail the `[ -f "${dtx}" ] && [ -r "${dtx}" ]` check in compile_to_dts,
but even with this check removed, the function cannot work: hexdump will
eat up the DTB magic, making the subsequent dtc call fail, as a pipe
cannot be rewound.

Simply remove this broken example, as there is already an alternative one
that works fine.

Fixes: 10eadc253ddf ("dtc: create tool to diff device trees")
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220113081918.10387-1-matthias.schiffer@ew.tq-group.com

dt-bindings: trivial-devices: fix double spaces in comments

Cleanup double spaces in some of the comments.

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/13b3f66efd3b20f1d9bbb9eff1eca00757ac5367.1642080090.git.stano.jakubek@gmail.com

dt-bindings: trivial-devices: fix swapped comments

sparkfun,qwiic-joystick and st,24c256 had their comments incorrectly
swapped. Swap them to make them correct.

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/7dc6ddb0b042cd243b2875e9aea81cad541d1c6b.1642080090.git.stano.jakubek@gmail.com

dt-bindings: vendor-prefixes: add Wingtech

The vendor prefix for Wingtech [1] is used in device tree [2], but was
not documented so far. Add it to the schema to document it.

[1] http://www.wingtech.com/en
[2] arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220113103110.GA4488@standask-GA-A55M-S2HP

dt-bindings: vendor-prefixes: add Thundercomm

The vendor prefix for Thundercomm [1] is used in device tree [2], but
was not documented so far. Add it to the schema to document it.

[1] https://www.thundercomm.com/
[2] arch/arm64/boot/dts/qcom/sdm845-db845c.dts

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220113103036.GA4456@standask-GA-A55M-S2HP

dt-bindings: vendor-prefixes: add Huawei

The vendor prefix for Huawei [1] is used in device trees [2][3], but was
not documented so far. Add it to the schema to document it.

[1] https://www.huawei.com/en/
[2] arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
[3] arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220113103005.GA4421@standask-GA-A55M-S2HP

dt-bindings: vendor-prefixes: add F(x)tec

The vendor prefix for F(x)tec [1] is used in device tree [2], but was
not documented so far. Add it to the schema to document it.

[1] https://www.fxtec.com/
[2] arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220113102926.GA4388@standask-GA-A55M-S2HP

dt-bindings: vendor-prefixes: add 8devices

The vendor prefix for 8devices [1] is used in device tree [2], but was
not documented so far. Add it to the schema to document it.

[1] https://www.8devices.com/
[2] arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220113102842.GA4357@standask-GA-A55M-S2HP

dt-bindings: power: reset: gpio-restart: Correct default priority

Commit bcd56fe1aa97 ("power: reset: gpio-restart: increase priority
slightly") changed the default restart priority 129, but did not update
the documentation. Correct this, so the driver and documentation have
the same default value.

Signed-off-by: Sander Vanheule <sander@svanheule.net>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220110214456.67087-1-sander@svanheule.net

Merge branch 'overlayfs-next' of git://git./linux/kernel/git/mszeredi/vfs.git

Merge branch 'for-next' of git://git./linux/kernel/git/hubcap/linux

Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git

Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git

Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git

Merge branch 'dev' of git://git./linux/kernel/git/jaegeuk/f2fs.git

Merge branch 'for_next' of git://git./linux/kernel/git/jack/linux-fs.git

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git

Merge branch 'master' of git://github.com/ceph/ceph-client.git

# Conflicts:
# include/linux/ceph/libceph.h
# net/ceph/ceph_common.c

Merge branch 'for-next' of git://git./linux/kernel/git/kdave/linux.git

Merge branch 'fscache-next' of git://git./linux/kernel/git/dhowells/linux-fs.git

Merge branch 'for-next' of git://git./linux/kernel/git/brauner/linux.git

Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git

Merge branch 'for-next' of git://git./linux/kernel/git/s390/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/riscv/linux.git

# Conflicts:
# arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
# arch/riscv/include/asm/sbi.h

Merge branch 'for-next' of git://git./linux/kernel/git/deller/parisc-linux.git

Merge branch 'next' of git://git./linux/kernel/git/greentime/linux.git

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

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git

Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git

Merge branch 'clk-next' of git://git./linux/kernel/git/clk/linux.git

Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git

Merge branch 'ti-next' of git://git./linux/kernel/git/ti/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/tegra/linux.git

Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git

Merge branch 'sunxi/for-next' of git://git./linux/kernel/git/sunxi/linux.git

Merge branch 'for-linux-next' of git://git./linux/kernel/git/sudeep.holla/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/krzk/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/mmind/linux-rockchip.git

Merge branch 'next' of git://git./linux/kernel/git/geert/renesas-devel.git

Merge branch 'for-next' of git://git./linux/kernel/git/nsaenz/linux-rpi.git

Merge branch 'for-next' of git://git./linux/kernel/git/qcom/linux.git

# Conflicts:
# arch/arm/configs/multi_v7_defconfig

Merge branch 'for-next' of git://git./linux/kernel/git/tmlind/linux-omap.git

Merge branch 'for-next' of git://git./linux/kernel/git/gclement/mvebu.git

Merge branch 'for-next' of git://git./linux/kernel/git/matthias.bgg/linux.git

Merge branch 'next' of git://git./linux/kernel/git/ssantosh/linux-keystone.git

Merge branch 'for-next' of git://git./linux/kernel/git/shawnguo/linux.git

Merge branch 'for-next' of https://git./linux/kernel/git/krzk/linux-mem-ctrl.git

Merge branch 'at91-next' of git://git./linux/kernel/git/at91/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/joel/bmc.git

Merge branch 'for-next' of git://git./linux/kernel/git/amlogic/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/mani/linux-actions.git

Merge branch 'for-next' of git://git./linux/kernel/git/soc/soc.git

Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git

Merge branch 'perf/core' of git://git./linux/kernel/git/acme/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/masahiroy/linux-kbuild.git

# Conflicts:
# scripts/link-vmlinux.sh

docs: ftrace: fix ambiguous sentence

The sentence looks ambiguous, rephrase it by adding ", there".

Signed-off-by: Huichun Feng <foxhoundsk.tw@gmail.com>
Signed-off-by: Ching-Chun (Jim) Huang <jserv@ccns.ncku.edu.tw>
Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Link: https://lore.kernel.org/r/20220111052000.2675944-1-foxhoundsk.tw@gmail.com
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

docs: staging/tee.rst: fix two typos found while reading

Signed-off-by: Wang Cheng <wanngchenng@gmail.com>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/r/20220115125236.34886-1-wanngchenng@gmail.com
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

Merge branch 'irq/irqchip-fixes' of git://git./linux/kernel/git/maz/arm-platforms.git

Merge branch 'fixes' of git://git./linux/kernel/git/rw/ubifs.git

Merge branch 'gpio/for-current' of git://git./linux/kernel/git/brgl/linux.git

Merge branch 'fix' of git://git./linux/kernel/git/leo/linux.git

Merge branch 'rtc-fixes' of git://git./linux/kernel/git/abelloni/linux.git

Merge branch 'next-fixes' of git://git./linux/kernel/git/kdave/linux.git

Merge branch 'hwmon' of git://git./linux/kernel/git/groeck/linux-staging.git

Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git

Merge branch 'fixes-togreg' of git://git./linux/kernel/git/jic23/iio.git

Merge branch 'for-usb-fixes' of git://git./linux/kernel/git/peter.chen/usb.git

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

Merge branch 'for-linus' of git://git./linux/kernel/git/broonie/spi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/broonie/regulator.git

Merge branch 'for-linus' of git://git./linux/kernel/git/broonie/regmap.git

Merge branch 'for-linus' of git://git./linux/kernel/git/broonie/sound.git

Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound.git

Merge branch 'master' of git://git./linux/kernel/git/pablo/nf.git

Merge branch 'master' of git://git./linux/kernel/git/bpf/bpf.git

Merge branch 'master' of git://git./linux/kernel/git/netdev/net.git

Merge branch 'fixes' of git://git./linux/kernel/git/powerpc/linux.git

Merge branch 'fixes' of https://git./linux/kernel/git/krzk/linux-mem-ctrl.git

Merge branch 'for-curr' of git://git./linux/kernel/git/vgupta/arc.git