All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Mack <daniel@caiaq.de>
To: Mark Brown <broonie@sirena.org.uk>
Cc: "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>
Subject: broonie/sound-2.6.git rebase?
Date: Sun, 15 Mar 2009 21:44:27 +0100	[thread overview]
Message-ID: <20090315204427.GA6977@buzzloop.caiaq.de> (raw)

Hi Mark,

Could you rebase your broonie/sound-2.6.git to Linus' master? When
trying to merge them, I currently get:

>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?

Thanks,
Daniel

             reply	other threads:[~2009-03-15 20:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-15 20:44 Daniel Mack [this message]
2009-03-15 21:13 ` broonie/sound-2.6.git rebase? Daniel Mack
2009-03-15 21:16 ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090315204427.GA6977@buzzloop.caiaq.de \
    --to=daniel@caiaq.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@sirena.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.