Hi Markus, Am Freitag, 8. November 2019, 16:18:39 CET schrieb Markus Reichl: > Am 08.11.19 um 15:41 schrieb Heiko Stübner: > > Am Montag, 4. November 2019, 16:22:25 CET schrieb Markus Reichl: > >> For rk3399-roc-pc is a mezzanine board available that carries M.2 and > >> POE interfaces. Use it with a separate dts. > >> > >> --- > >> v3: Use enum in binding and full name in compatible string and file name. > >> v2: Add new compatible string for roc-pc with mezzanine board. > >> -- > >> > >> Signed-off-by: Markus Reichl <m.reichl@xxxxxxxxxxxxx> > >> --- > >> .../devicetree/bindings/arm/rockchip.yaml | 4 +- > >> arch/arm64/boot/dts/rockchip/Makefile | 1 + > >> .../dts/rockchip/rk3399-roc-pc-mezzanine.dts | 72 ++ > >> .../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 757 +---------------- > >> .../boot/dts/rockchip/rk3399-roc-pc.dtsi | 770 ++++++++++++++++++ > >> 5 files changed, 847 insertions(+), 757 deletions(-) > >> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts > >> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi > >> > > > >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts > >> index 7e07dae33d0f..cd4195425309 100644 > >> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts > >> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts > >> @@ -4,764 +4,9 @@ > > > > This whole hunk fails to apply against my current branch for 5.5 > > which contain your other patches [0]. > > > > And the moved block is obviously so big that I can't really check > > which part is somehow different, so I'd ask you to rebase this > > patch accordingly, so that it applies again. > > Yes, will rebase and come with v4. Not wanting to put any pressure on you, but do you have an estimate for this? I need to do my second (and final) round of pull requests for v5.5, so it would of course be interesting if it's sensible to wait for your respin ;-) Thanks Heiko
