diff options
author | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 16:44:37 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 16:44:37 +0200 |
commit | c69badd1d74690e5b5b4d5c3c254a1e64bcc1ac9 (patch) | |
tree | 0cc50a01e679d531a18b44a04b90d42d1f462b6e /.mailmap | |
parent | 4952aa696a9f221c5e34e5961e02fca41ef67ad6 (diff) | |
parent | 40e9541959100e017533e18e44d07eed44f91dc5 (diff) |
Merge tag 'qcom-arm64-fixes-for-6.0' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm ARM64 DTS fixes for 6.0
This corrects invalid IOMMU streams for the SM8150 CDSP FastRPC, moves
the wakeup-source of SC7280 USB nodes to the correct place, fixes the
SM8350 UFS PHY serdes size to not overlap with the other subnodes and
updates the firmware location for the Lenovo ThinkPad X13s to match the
movement in linux-firmware.
It also updates MAINTAINERS and .mailmap to reflect the changes in my
email address.
* tag 'qcom-arm64-fixes-for-6.0' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
arm64: dts: qcom: sm8350: fix UFS PHY serdes size
arm64: dts: qcom: sc8280xp-x13s: Update firmware location
MAINTAINERS: Update Bjorn's email address
arm64: dts: qcom: sc7280: move USB wakeup-source property
arm64: dts: qcom: thinkpad-x13s: Fix firmware location
arm64: dts: qcom: sm8150: Fix fastrpc iommu values
Link: https://lore.kernel.org/r/20220921142939.1310163-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -71,6 +71,9 @@ Ben M Cahill <ben.m.cahill@intel.com> Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net> Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com> Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com> +Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se> +Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org> +Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com> Björn Steinbrink <B.Steinbrink@gmx.de> Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com> Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com> |