On Tue, 2 May 2023 10:06:20 +0200 Ludwig Kormann <ludwig.kormann@xxxxxxxxxxxxx> wrote: Hi, > Hello, > > thanks for the reviews so far! > > Is there anything I can do / need to do for my patch series for it to > get merged before -rc1? The cutoff date for most board DT patches to get into a release is around -rc5/-rc6 of the *previous* release: patches should live in linux-next for a while. Also most pull requests need to "trickle up" the stream first (from the sunxi tree to the SoC tree, then into mainline). So -rc1 is out of reach now. > The patch series was based on the "for-next" branch in jernej's tree, > but it seems that it was too late for the "dt-for-6.4" merge. Yes. > So I'm just trying to understand in general what the best way in this > situation would be: > - wait if someone else takes the patch series before -rc1 > - wait for -rc1 and rebase, rework, send a new version of the patch > series (because of the planned restructuring of the ARM dts directory) Yes, this is the way to go. The maintainers will probably take care of any minor conflicts (like in the Makefile), so (the upcoming) -rc1 should be the base tree. For new DT files the conflict potential should be minimal anyway. Just make sure to run "make dt_binding_check" and "make dtbs_check" again, because the rules might have been updated meanwhile. Cheers, Andre > - wait for -rc3 (?) and rebase & rework the patch series for jernej's > tree for the "dt-for-6.5" branch > > Thanks for your help. > > kind regards > Ludwig Kormann > > > Am 20.04.23 um 12:24 schrieb Ludwig Kormann: > > Add board support for ICnova A20 SomPi compute module on > > ICnova ADB4006 development board. > > > > v3: > > - drop stray blank lines at end of files > > - separate patch for bindings > > - update licensing to "GPL-2.0 OR MIT" > > - fix typo: ICNova -> ICnova > > > > v2: > > - use short licensing header > > - remove deprecated elements from led nodes > > - disable csi power supply > > - add missing pins in usbphy node > > - split dts into SoM dtsi and carrier board dts > > > > v1 of this patch was sent to the uboot mailing list [1]. > > > > [1] https://lists.denx.de/pipermail/u-boot/2023-April/514605.html > > > > Ludwig Kormann (2): > > dt-bindings: arm: sunxi: add ICnova A20 ADB4006 binding > > arm: dts: sunxi: Add ICnova A20 ADB4006 board > > > > .../devicetree/bindings/arm/sunxi.yaml | 6 + > > arch/arm/boot/dts/Makefile | 1 + > > .../boot/dts/sun7i-a20-icnova-a20-adb4006.dts | 137 ++++++++++++++++++ > > arch/arm/boot/dts/sun7i-a20-icnova-a20.dtsi | 62 ++++++++ > > 4 files changed, 206 insertions(+) > > create mode 100644 arch/arm/boot/dts/sun7i-a20-icnova-a20-adb4006.dts > > create mode 100644 arch/arm/boot/dts/sun7i-a20-icnova-a20.dtsi > >
