[alsa-devel] More HDA NID / control / proc related changes
Takashi Iwai
tiwai at suse.de
Mon Dec 14 18:05:15 CET 2009
At Mon, 14 Dec 2009 16:45:18 +0100 (CET),
Jaroslav Kysela wrote:
>
> Anyway, I created for-next branch in my repository. Could you import changes
> without explicitly asking if you do not have any comments? I'll merge
> patches from Clemens there as well.
Could you rebase it rather on the latest Linus tree instead?
Or, rebase it on topic/hda branch I opened now for 2.6.34
development.
My master branch is for the development tip, and its merge history
is pretty messy. Ditto for for-next branch. It contains lots of
unneeded merge commits. The merge history gets straightened when
backed to for-linus branch.
If your changes are only for HD-audio, then you can branch from either
fix/hda or topic/hda branch in my tree. The former is for the current
kernel and the latter for the next kernel.
For ASoC, fix/asoc and topic/asoc, and for others, fix/misc and
topic/misc branches are available for (relatively) straight history.
I cherry-pick'ed the last commit of Clemens to topic/misc.
So I'd need only your topic/hda-nid branch for merge.
thanks,
Takashi
More information about the Alsa-devel
mailing list