diff options
author | Jakub Kicinski <kuba@kernel.org> | 2024-08-22 17:05:09 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2024-08-22 17:06:18 -0700 |
commit | 761d527d5d0036b98a2cecf4de1293d84d452aa1 (patch) | |
tree | 077007afc1704c75f7e733c69bfd1603b8c8e0df /Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml | |
parent | bfc52deef5ed58d92cfbe68dbceee3102617a8df (diff) | |
parent | aa0743a229366e8c1963f1b72a1c974a9d15f08f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
drivers/net/ethernet/broadcom/bnxt/bnxt.h
c948c0973df5 ("bnxt_en: Don't clear ntuple filters and rss contexts during ethtool ops")
f2878cdeb754 ("bnxt_en: Add support to call FW to update a VNIC")
Link: https://patch.msgid.link/20240822210125.1542769-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml index 6b9c1d198b14..10afe984e2fb 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Qualcomm Global Clock & Reset Controller on MSM8994 maintainers: - - Konrad Dybcio <konrad.dybcio@somainline.org> + - Konrad Dybcio <konradybcio@kernel.org> description: | Qualcomm global clock control module provides the clocks, resets and power |