On Tue, Feb 15, 2022 at 02:34:01PM +0100, Takashi Iwai wrote: > On Tue, 15 Feb 2022 14:29:54 +0100, > Takashi Iwai wrote: > > > > On Thu, 10 Feb 2022 07:50:51 +0100, > > Mohan Kumar wrote: > > > > > > This series add the support for TEGRA234 HDA driver support > > > > > > Mohan Kumar (6): > > > ALSA: hda/tegra: Add Tegra234 hda driver support > > > ALSA: hda/tegra: Hardcode GCAP ISS value on T234 > > > ALSA: hda/tegra: Update scratch reg. communication > > > dt-bindings: Add HDA support for Tegra234 > > > dt-bindings: Document Tegra234 HDA support > > > arm64: tegra: Add hda dts node for Tegra234 > > > > Applied all six patches to for-next branch now. > > ... and now I realized that it's conflicting with the latest Tegra234 > reset stuff on linux-next. > > Maybe better to split the patches to be merged through several trees? It's usually best for me to pick up at least the DT changes (patch 6) into the Tegra tree, that way I can easily resolve conflicts there when they arise. The device tree bindings (patches 3 & 4) traditionally go along with the driver changes, though. If you prefer the patch series to be split, that's fine. For other subsystems we usually deal with this by having one series and then the subsystem maintainer picking up all the non-DT changes and I take the rest. Thierry
Attachment:
signature.asc
Description: PGP signature
