* linux-next: manual merge of the sound-asoc tree
@ 2012-02-03 1:59 Stephen Rothwell
2012-02-03 10:51 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-02-03 1:59 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/codecs/wm5100.c due to a bad merge resolution in commit
05960268bcef ("Merge branch 'for-3.4' into asoc-next") from the
sound-asoc tree which left the conflict unresolved. :-(
I fixed it up (I think - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc sound/soc/codecs/wm5100.c
index c1c351a,72ebbdb..0000000
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@@ -2076,17 -2097,21 +2097,7 @@@ static void wm5100_micd_irq(struct wm51
snd_soc_jack_report(wm5100->jack, SND_JACK_BTN_0,
SND_JACK_BTN_0);
} else if (wm5100->jack_detecting) {
- dev_dbg(wm5100->dev, "Headphone detected\n");
- wm5100->jack_detecting = false;
- snd_soc_jack_report(wm5100->jack, SND_JACK_HEADPHONE,
- SND_JACK_HEADPHONE);
-
- /* Increase the detection rate a bit for
- * responsiveness.
- */
- regmap_update_bits(wm5100->regmap, WM5100_MIC_DETECT_1,
- WM5100_ACCDET_RATE_MASK,
- 7 << WM5100_ACCDET_RATE_SHIFT);
-<<<<<<< HEAD
- dev_dbg(codec->dev, "Headphone detected\n");
- wm5100->jack_detecting = false;
- snd_soc_jack_report(wm5100->jack, SND_JACK_HEADPHONE,
- SND_JACK_HEADPHONE);
-
- /* Increase the detection rate a bit for
- * responsiveness.
- */
- snd_soc_update_bits(codec, WM5100_MIC_DETECT_1,
- WM5100_ACCDET_RATE_MASK,
- 7 << WM5100_ACCDET_RATE_SHIFT);
-=======
+ wm5100_report_headphone(wm5100);
->>>>>>> for-3.4
}
}
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the sound-asoc tree
2012-02-03 1:59 linux-next: manual merge of the sound-asoc tree Stephen Rothwell
@ 2012-02-03 10:51 ` Mark Brown
2012-02-07 23:52 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2012-02-03 10:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
On Fri, Feb 03, 2012 at 12:59:02PM +1100, Stephen Rothwell wrote:
> I fixed it up (I think - see below) and can carry the fix as necessary.
That's the correct fix, thanks. I'll resolve this in my tree once
Linus' tree has merged the conflicting stuff.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree
2012-02-03 10:51 ` Mark Brown
@ 2012-02-07 23:52 ` Stephen Rothwell
2012-02-08 11:25 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-02-07 23:52 UTC (permalink / raw)
To: Mark Brown; +Cc: Liam Girdwood, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
Hi Mark,
On Fri, 3 Feb 2012 10:51:24 +0000 Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
>
> On Fri, Feb 03, 2012 at 12:59:02PM +1100, Stephen Rothwell wrote:
>
> > I fixed it up (I think - see below) and can carry the fix as necessary.
>
> That's the correct fix, thanks. I'll resolve this in my tree once
> Linus' tree has merged the conflicting stuff.
So, you have redone the merge (it was commit 05960268bcef and is now
6127dd802637) and still left the conflict tags in
sound/soc/codecs/wm5100.c ...
:-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the sound-asoc tree
@ 2011-06-16 2:40 Stephen Rothwell
2011-06-16 10:12 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-06-16 2:40 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree failed badly. It seems
that it has been rebased on top of next-20110615. You cannot base a
tree in linux-next on linux-next itself!
I have used the version of the sound-asoc tree from next-20110615 for
today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree
2011-06-16 2:40 Stephen Rothwell
@ 2011-06-16 10:12 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2011-06-16 10:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel
On Thu, Jun 16, 2011 at 12:40:55PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the sound-asoc tree failed badly. It seems
> that it has been rebased on top of next-20110615. You cannot base a
> tree in linux-next on linux-next itself!
> I have used the version of the sound-asoc tree from next-20110615 for
> today.
Sorry, pushed the wrong tree to the wrong repository.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-08 11:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-03 1:59 linux-next: manual merge of the sound-asoc tree Stephen Rothwell
2012-02-03 10:51 ` Mark Brown
2012-02-07 23:52 ` Stephen Rothwell
2012-02-08 11:25 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2011-06-16 2:40 Stephen Rothwell
2011-06-16 10:12 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).