[alsa-devel] broonie/sound-2.6.git rebase?

Daniel Mack daniel at caiaq.de
Sun Mar 15 22:13:00 CET 2009

On Sun, Mar 15, 2009 at 09:44:27PM +0100, Daniel Mack wrote:
> Could you rebase your broonie/sound-2.6.git to Linus' master? When
> trying to merge them, I currently get:

Aii, my bad. Forget it.


> From git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6
>  * branch            pxa-ssp    -> FETCH_HEAD
> Auto-merging arch/arm/mach-shark/include/mach/io.h
> CONFLICT (content): Merge conflict in arch/arm/mach-shark/include/mach/io.h
> Auto-merging sound/soc/codecs/cs4270.c
> Auto-merging sound/soc/codecs/tlv320aic26.c
> Auto-merging sound/soc/codecs/wm8400.c
> CONFLICT (add/add): Merge conflict in sound/soc/codecs/wm8400.c
> Auto-merging sound/soc/codecs/wm8580.c
> CONFLICT (content): Merge conflict in sound/soc/codecs/wm8580.c
> Auto-merging sound/soc/pxa/pxa-ssp.c
> Auto-merging sound/soc/pxa/pxa2xx-ac97.c
> Auto-merging sound/soc/s3c24xx/s3c24xx-i2s.c
> Automatic merge failed; fix conflicts and then commit the result.
> Or is there any mystery about git I still haven't fully understood?

More information about the Alsa-devel mailing list