Closed tsawyer closed 10 months ago
Wasn't most of this already done in commit 015c612eb32f16a57c8017ef2a16411f1ea1f1ee ?
Looks like you are right. Not sure what happened there . All I'm adding is the res_timing_timerfd and res_dahdi_timing comments in modules.conf.
Maybe you're reusing the same PR somehow, since it contains merged changes? It seems like it thinks there's no conflicts, but I'm not fully sure what would happen if we merge it again.
Is there a way to revert to the way it was?
Is there a way to revert to the way it was?
You could try rebasing off the current master branch
I think the origin got messed up. It will need to be fixed on your end.
It looks like the first three commits are already in the Master branch. So I'm closing this PR w/o merging.
Set and comment that res_timing_timerfd.so is the preferred timing module for ASL3.