linux 3.16
rename deprecated options
remove obsolete stuff