the first one already got non-trivial merge conflicts:
# both modified: backends/mixer_pulse.cpp
# both added: core/ControlPool.cpp
# both added: core/ControlPool.h
# both modified: core/mixdevice.cpp
# both modified: dbus/dbuscontrolwrapper.cpp
# both modified: dbus/dbuscontrolwrapper.h
I tried:
$ git branch --no-track pulseaudio- fixes-backport- 4.8 origin/KDE/4.8 fixes-backport- 4.8 ab6b1199de35829 ce31f0f733 52078e7f1180900 6999d151d6 ]
$ git checkout pulseaudio-
$ git cherry-pick -x 3314a12de7f4d07
[ $ git cherry-pick -x 9b4872a60555c63
the first one already got non-trivial merge conflicts:
# both modified: backends/ mixer_pulse. cpp l.cpp lwrapper. cpp lwrapper. h
# both added: core/ControlPoo
# both added: core/ControlPool.h
# both modified: core/mixdevice.cpp
# both modified: dbus/dbuscontro
# both modified: dbus/dbuscontro
which were beyond my knowledge to fix.