Re: linux-next: manual merge of the sound tree with the arm-soc tree

2019-02-25 Thread Mark Brown
On Mon, Feb 25, 2019 at 02:38:50PM +0100, Arnd Bergmann wrote: > On Mon, Feb 25, 2019 at 12:24 PM Sameer Pujar wrote: > > The motivation for adding custom sound card name is following, > > 1. When for boards, multiple HDMI/DP ports are exposed, it is sometimes > > necessary to know the defaul

Re: linux-next: manual merge of the sound tree with the arm-soc tree

2019-02-25 Thread Arnd Bergmann
On Mon, Feb 25, 2019 at 12:24 PM Sameer Pujar wrote: > On 2/25/2019 4:44 PM, Takashi Iwai wrote: > > On Mon, 25 Feb 2019 10:19:15 +0100, Arnd Bergmann wrote: > >> On Mon, Feb 25, 2019 at 2:36 AM Stephen Rothwell > >> wrote: > >> I see this property being used in commit c0bde003a013 ("ALSA: > >>

Re: linux-next: manual merge of the sound tree with the arm-soc tree

2019-02-25 Thread Sameer Pujar
On 2/25/2019 4:44 PM, Takashi Iwai wrote: On Mon, 25 Feb 2019 10:19:15 +0100, Arnd Bergmann wrote: On Mon, Feb 25, 2019 at 2:36 AM Stephen Rothwell wrote: Hi Takashi, Today's linux-next merge of the sound tree got conflicts in: arch/arm64/boot/dts/nvidia/tegra194-p2972-.dts arch/

Re: linux-next: manual merge of the sound tree with the arm-soc tree

2019-02-25 Thread Takashi Iwai
On Mon, 25 Feb 2019 10:19:15 +0100, Arnd Bergmann wrote: > > On Mon, Feb 25, 2019 at 2:36 AM Stephen Rothwell > wrote: > > > > Hi Takashi, > > > > Today's linux-next merge of the sound tree got conflicts in: > > > > arch/arm64/boot/dts/nvidia/tegra194-p2972-.dts > > arch/arm64/boot/dts/n

Re: linux-next: manual merge of the sound tree with the arm-soc tree

2019-02-25 Thread Arnd Bergmann
On Mon, Feb 25, 2019 at 2:36 AM Stephen Rothwell wrote: > > Hi Takashi, > > Today's linux-next merge of the sound tree got conflicts in: > > arch/arm64/boot/dts/nvidia/tegra194-p2972-.dts > arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi > > between commits: > > 5eef17ee764d ("arm64: tegr

linux-next: manual merge of the sound tree with the arm-soc tree

2019-02-24 Thread Stephen Rothwell
Hi Takashi, Today's linux-next merge of the sound tree got conflicts in: arch/arm64/boot/dts/nvidia/tegra194-p2972-.dts arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi between commits: 5eef17ee764d ("arm64: tegra: p2972: Sort nodes properly") be4f0dd347ad ("arm64: tegra: p2597: Sort