[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAEnQRZCLE7DHumOCDSXxaKEgpukDgP5EtH=j7xMwTBJcTWQTZw@mail.gmail.com>
Date: Mon, 18 Feb 2019 20:00:48 +0200
From: Daniel Baluta <daniel.baluta@...il.com>
To: Mark Brown <broonie@...nel.org>
Cc: Takashi Iwai <tiwai@...e.de>,
"alsa-devel@...a-project.org" <alsa-devel@...a-project.org>,
"kuninori.morimoto.gx@...esas.com" <kuninori.morimoto.gx@...esas.com>,
"gregkh@...uxfoundation.org" <gregkh@...uxfoundation.org>,
"S.j. Wang" <shengjiu.wang@....com>,
"lgirdwood@...il.com" <lgirdwood@...il.com>,
"vicencb@...il.com" <vicencb@...il.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
dl-linux-imx <linux-imx@....com>,
Daniel Baluta <daniel.baluta@....com>
Subject: Re: [alsa-devel] [PATCH] ASoC: simple-card: Fix refcount underflow
On Mon, Feb 18, 2019 at 7:50 PM Mark Brown <broonie@...nel.org> wrote:
>
> On Mon, Feb 18, 2019 at 08:52:26AM +0100, Takashi Iwai wrote:
> > Daniel Baluta wrote:
>
> > > > Fixes: commit da215354eb55c ("ASoC: simple-card: merge simple-scu-
> > > > card")
>
> > > Thanks! I thought about adding this but the current patch will not
> > > cleanly apply because of:
>
> > > 2d01a84605a55c ("ASoC: simple-card: reduce naming prefix")
>
> That doesn't matter for fixes tags. However...
>
> > Yeah, it's a bit tricky because of the code change at this time.
>
> > At best, send two patches, once for 5.0 and once for 5.1, and let Mark
> > apply both of them and do the empty merge from 5.0 to 5.1, or let him
> > resolve the merge conflict by applying manually the 5.1 patch.
>
> ...since this is something that needs to be fixed for v5.0 we need a
> patch that can be applied on v5.0 (and has been tested by someone who
> sees the issue there). Takashi's plan seems like a good way to do that,
> if you could send a patch against my for-5.0 branch (or just Linus'
> tree) that'd be great.
for-5.0 branch Kuninori's patch works fine:
https://patchwork.kernel.org/patch/10814255/
for-5.1 branch and later my patch works fine:
https://patchwork.kernel.org/patch/10817449/
Would you want me to change the patch for 5.0 to have an identical commit
message as the one for 5.1?
Powered by blists - more mailing lists