merge with upstream, that is an all in one patch + smtnice2 patch
enable experimental smtnice2 patch
change checksums of .config to my own files