projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f2906aa 5e757de)
Merge tag 'dt-fixes-for-palmer-5.19-rc3' of ssh://gitolite.kernel.org/pub/scm/linux...
authorPalmer Dabbelt <palmer@rivosinc.com>
Thu, 16 Jun 2022 22:13:10 +0000 (15:13 -0700)
committerPalmer Dabbelt <palmer@rivosinc.com>
Thu, 16 Jun 2022 22:13:10 +0000 (15:13 -0700)
commita7c1c97fb1e64b0825a2ee892d60da6fd22d3b47
tree809b8384dc76c01c438c038c9b90a201732e5baftree | snapshot
parentf2906aa863381afb0015a9eb7fefad885d4e5a56commit | diff
parent5e757deddd918edb8cb2fdb56eb79656ffc6dadecommit | diff
Merge tag 'dt-fixes-for-palmer-5.19-rc3' of ssh://gitolite./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
Domain: System / Kernel;