Merge branches 'debug-module-param' and 'upstream' into for-linus