Ok, Let me resync linux-next to clear the conflict and will resend patches with v3.
-----Original Message----- From: Takashi Iwai tiwai@suse.de Sent: Tuesday, February 15, 2022 7:04 PM To: Mohan Kumar D mkumard@nvidia.com Cc: broonie@kernel.org; lgirdwood@gmail.com; robh+dt@kernel.org; thierry.reding@gmail.com; tiwai@suse.com; Jonathan Hunter jonathanh@nvidia.com; Sameer Pujar spujar@nvidia.com; alsa-devel@alsa-project.org; devicetree@vger.kernel.org; linux-tegra@vger.kernel.org; linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 0/6] Add Tegra234 HDA support
External email: Use caution opening links or attachments
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?
Takashi