diff options
| author |   Palmer Dabbelt <palmer@rivosinc.com> | 2022-06-16 15:13:10 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2022-06-16 15:13:10 -0700 |
| commit | a7c1c97fb1e64b0825a2ee892d60da6fd22d3b47 (patch) | |
| tree | 809b8384dc76c01c438c038c9b90a201732e5baf /scripts/generate_rust_analyzer.py | |
| parent | Linux 5.19-rc1 (diff) | |
| parent | riscv: dts: microchip: re-add pdma to mpfs device tree (diff) | |
| download | wireguard-linux-a7c1c97fb1e64b0825a2ee892d60da6fd22d3b47.tar.xz wireguard-linux-a7c1c97fb1e64b0825a2ee892d60da6fd22d3b47.zip | |
Merge tag 'dt-fixes-for-palmer-5.19-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/conor/linux into fixes
Microchip RISC-V devicetree fixes for 5.19-rc3
A single fix for mpfs.dtsi:
- The sifive pdma entry fell through the cracks between versions of my
dt patches & I gave Zong the wrong conflict resolution, so it is
added back.
* tag 'dt-fixes-for-palmer-5.19-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/conor/linux:
riscv: dts: microchip: re-add pdma to mpfs device tree
Diffstat (limited to 'scripts/generate_rust_analyzer.py')
0 files changed, 0 insertions, 0 deletions