At Mon, 8 Sep 2008 19:41:11 +0200, =?UTF-8?Q?Vedran_Mileti=C4=87?= wrote:
2008/9/8 Takashi Iwai tiwai@suse.de:
At Sun, 7 Sep 2008 17:07:39 +0200, =?UTF-8?Q?Vedran_Mileti=C4=87?= wrote:
I started with Takashi's sound-unstable tree as a base:
Oh, please base on sound-2.6 tree. The unstable tree is really unstable, not for upstream merge.
Ok, thanks for clarification. Will do.
Fixed:
- ice1724 compilation error (one { too much)
Well, I already applied your first one, so this version conflicts. Please re-create from the latest sound-2.6.git tree.
I know this isn't a place to ask for git lessons, but is there a way to do it semi-automagically with git?
Usually, pull the upstream, and rebase your changes onto it. In your case, just doing git-cherry-pick would suffice because it's a single patch anyway.
Takashi