From: Palmer Dabbelt <palmer@rivosinc.com>
Date: Thu, 16 Jun 2022 22:13:10 +0000 (-0700)
Subject: Merge tag 'dt-fixes-for-palmer-5.19-rc3' of ssh://gitolite.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a7c1c97fb1e64b0825a2ee892d60da6fd22d3b47;p=linux.git

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
---

a7c1c97fb1e64b0825a2ee892d60da6fd22d3b47