On Mon, Jun 27, 2016 at 03:05:54PM +0200, Lukas Slebodnik wrote:
It depends on which patches will be pushed to master.
but I was able to apply patch from this thread with 3way merge
on Pavel's sssctl branch from fedorapeople; there weren't any conflicts
The latest ones on the list. I will push them once CI finishes and then
it will be clear what to rebase on.